improving code for patient caller and bridge

cmd/pagient-server/web.go

@@ -104,29 +104,29 @@ func Web() *cli.Command {
 
 			{
 				// Setup Bridge Database Connection
-				bDB, err := bridgeDB.Open()
+				db, err := bridgeDB.Open()
 				if err != nil {
 					log.Fatal().
 						Err(err).
 						Msg("bridge database initialization failed")
 
 					return err
 				}
-				defer bDB.Close()
+				defer db.Close()
 
 				// Setup Software Bridge
-				softwareBridge := bridge.NewBridge(bDB)
+				b := bridge.NewBridge(db)
 
 				// Setup Caller
-				pagerCaller := caller.NewCaller(s, softwareBridge)
+				c := caller.NewCaller(s, b)
 				stop := make(chan struct{}, 1)
 
 				gr.Add(func() error {
 					log.Info().
 						Msg("starting caller")
 
 					every := time.Duration(config.Bridge.PollingInterval) * time.Second
-					return pagerCaller.Run(every, stop)
+					return c.Run(every, stop)
 				}, func(reason error) {
 					close(stop)
 

internal/bridge/bridge.go

@@ -28,9 +28,9 @@ func NewBridge(db DB) *DefaultBridge {
 
 // GetToBeExaminedPatients returns all patients that are queued to be examined next
 func (b *DefaultBridge) GetToBeExaminedPatients() ([]*model.Patient, error) {
-	assignments, err := b.getRoomAssignments()
+	assignments, err := b.db.GetRoomAssignments(config.Bridge.CallActionWZ, config.Bridge.CallActionQueuePosition)
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, errors.Wrap(err, "get patients by room assignment failed")
 	}
 
 	patients := mapAssignmentsToPatients(assignments)
@@ -40,9 +40,9 @@ func (b *DefaultBridge) GetToBeExaminedPatients() ([]*model.Patient, error) {
 
 // GetExaminedPatients returns all patients that have been examined and are finished now since last call
 func (b *DefaultBridge) GetExaminedPatients() ([]*model.Patient, error) {
-	assignments, err := b.getRoomAssignments()
+	assignments, err := b.db.GetRoomAssignments(config.Bridge.CallActionWZ, config.Bridge.CallActionQueuePosition)
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, errors.Wrap(err, "get patients by room assignment failed")
 	}
 
 	removedAssignments := subtractSet(b.lastAssignments, assignments)
@@ -56,11 +56,6 @@ func (b *DefaultBridge) GetExaminedPatients() ([]*model.Patient, error) {
 	return patients, nil
 }
 
-func (b *DefaultBridge) getRoomAssignments() ([]*bridgeModel.RoomAssignment, error) {
-	assignments, err := b.db.GetRoomAssignments(config.Bridge.CallActionWZ, config.Bridge.CallActionQueuePosition)
-	return assignments, errors.Wrap(err, "get patients by room assignment failed")
-}
-
 func subtractSet(assignmentsA, assignmentsB []*bridgeModel.RoomAssignment) []*bridgeModel.RoomAssignment {
 	sortAssignmentsByPID(assignmentsB)