From 5c16b325dcc591a1e61e89c933599464973a17a2 Mon Sep 17 00:00:00 2001 From: Andrea Acampora Date: Wed, 8 Mar 2023 13:11:48 +0100 Subject: [PATCH] chore: use repository interface instead of db manager --- .../application/service/TrackingServices.kt | 20 +++++++++---------- .../infrastructure/events/KafkaClient.kt | 3 ++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/kotlin/application/service/TrackingServices.kt b/src/main/kotlin/application/service/TrackingServices.kt index 8fd575af..320893a9 100644 --- a/src/main/kotlin/application/service/TrackingServices.kt +++ b/src/main/kotlin/application/service/TrackingServices.kt @@ -8,22 +8,22 @@ package application.service -import application.controller.manager.StaffTrackingDatabaseManager import entity.HealthProfessionalId import entity.RoomId import entity.TrackingData +import usecase.repository.TrackingDataRepository import java.time.Instant /** The module with all application services. */ object TrackingServices { - /** The application service to add some [trackingData] given the [staffTrackingDatabaseManager]. */ + /** The application service to add some [trackingData] given the [trackingDataRepository]. */ class AddTrackingData( private val trackingData: TrackingData, - private val staffTrackingDatabaseManager: StaffTrackingDatabaseManager + private val trackingDataRepository: TrackingDataRepository ) : ApplicationService { override fun execute(): Boolean = - staffTrackingDatabaseManager.addTrackingData(trackingData) + trackingDataRepository.addTrackingData(trackingData) } /** The application service to get health professionals tracking data @@ -31,11 +31,11 @@ object TrackingServices { class GetHealthProfessionalTrackingData( private val healthProfessionalId: HealthProfessionalId, private val from: Instant?, - private val staffTrackingDatabaseManager: StaffTrackingDatabaseManager + private val trackingDataRepository: TrackingDataRepository ) : ApplicationService> { override fun execute(): Set = - staffTrackingDatabaseManager.getHealthProfessionalTrackingData(healthProfessionalId, from) + trackingDataRepository.getHealthProfessionalTrackingData(healthProfessionalId, from) } /** The application service to get room tracking data @@ -43,21 +43,21 @@ object TrackingServices { class GetRoomTrackingData( private val roomId: RoomId, private val from: Instant?, - private val staffTrackingDatabaseManager: StaffTrackingDatabaseManager + private val trackingDataRepository: TrackingDataRepository ) : ApplicationService> { override fun execute(): Set = - staffTrackingDatabaseManager.getRoomTrackingData(roomId, from) + trackingDataRepository.getRoomTrackingData(roomId, from) } /** The application service to get the latest tracking data * given the [trackingDataRepository] and [from] a certain moment. */ class GetLatestTrackingData( private val from: Instant?, - private val staffTrackingDatabaseManager: StaffTrackingDatabaseManager + private val trackingDataRepository: TrackingDataRepository ) : ApplicationService> { override fun execute(): Set = - staffTrackingDatabaseManager.getLatestTrackingData(from) + trackingDataRepository.getLatestTrackingData(from) } } diff --git a/src/main/kotlin/infrastructure/events/KafkaClient.kt b/src/main/kotlin/infrastructure/events/KafkaClient.kt index 3b8aeb08..5164d8b6 100644 --- a/src/main/kotlin/infrastructure/events/KafkaClient.kt +++ b/src/main/kotlin/infrastructure/events/KafkaClient.kt @@ -8,6 +8,7 @@ package infrastructure.events +import application.controller.StaffTrackingController import application.controller.manager.StaffTrackingDatabaseManager import application.service.TrackingServices import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper @@ -60,7 +61,7 @@ class KafkaClient(private val dbManager: StaffTrackingDatabaseManager) : EventCo } override fun consume(event: TrackingEventDto): Boolean = - TrackingServices.AddTrackingData(event.toTrackingData(), dbManager).execute() + TrackingServices.AddTrackingData(event.toTrackingData(), StaffTrackingController(dbManager)).execute() companion object { /** The topic on which consume tracking events. */