Merge pull request #156 from effectivemade/backend

[~] fix find free workspaces
Student-Labs-2023 · Aug 25, 2023 · e91e61a · e91e61a
2 parents f341c7e + 8271f4e
commit e91e61a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/...src/main/kotlin/office/effective/features/booking/repository/BookingCalendarRepository.kt b/...src/main/kotlin/office/effective/features/booking/repository/BookingCalendarRepository.kt
@@ -27,10 +27,11 @@ class BookingCalendarRepository(
         ?: throw Exception("Config file does not contain minimum time")
 
     private fun getCalendarIdByWorkspace(workspaceId: UUID): String {
-        if (workspaceRepository.findById(workspaceId)?.tag != "meeting") {
-            return defaultCalendar
+        return try {
+            calendarRepository.findByWorkspace(workspaceId)
+        } catch (e: InstanceNotFoundException) {
+            defaultCalendar
         }
-        return calendarRepository.findByWorkspace(workspaceId)
     }
 
     override fun existsById(id: String): Boolean {

diff --git a/...end/src/main/kotlin/office/effective/features/workspace/repository/WorkspaceRepository.kt b/...end/src/main/kotlin/office/effective/features/workspace/repository/WorkspaceRepository.kt
@@ -1,12 +1,15 @@
 package office.effective.features.workspace.repository
 
 import office.effective.common.exception.InstanceNotFoundException
+import office.effective.features.booking.repository.BookingCalendarRepository
+import office.effective.features.booking.repository.IBookingRepository
 import office.effective.features.booking.repository.WorkspaceBooking
 import office.effective.features.workspace.converters.WorkspaceRepositoryConverter
 import office.effective.model.IntegrationModel
 import office.effective.model.Utility
 import office.effective.model.Workspace
 import office.effective.model.WorkspaceZone
+import org.koin.core.context.GlobalContext
 import org.ktorm.database.Database
 import org.ktorm.dsl.*
 import org.ktorm.entity.*
@@ -138,21 +141,17 @@ class WorkspaceRepository(private val database: Database, private val converter:
         if (database.workspaceTags.count { it.name eq tag } == 0)
             throw InstanceNotFoundException(WorkspaceTagEntity::class, "Workspace tag $tag not found")
 
-        return database.from(Workspaces)
-            .innerJoin(right = WorkspaceTags, on = WorkspaceTags.id eq Workspaces.tagId)
-            .leftJoin(right = WorkspaceZones, on = WorkspaceZones.id eq Workspaces.zoneId)
-            .leftJoin(
-                right = WorkspaceBooking,
-                on = (Workspaces.id eq WorkspaceBooking.workspaceId)
-                    .and(WorkspaceBooking.beginBooking lt endTimestamp)
-                    .and(WorkspaceBooking.endBooking gt beginTimestamp)
-            )
-            .select()
-            .where(WorkspaceBooking.workspaceId.isNull() and (WorkspaceTags.name eq tag))
-            .map { row ->
-                val entity = Workspaces.createEntity(row)
-                converter.entityToModel(entity, findUtilitiesByWorkspaceId(entity.id))
-            }.toList()
+        val calendarRepository: IBookingRepository = GlobalContext.get().get() //TODO: REWRITE IT FROM SCRATCH
+        val freeWorkspaces = mutableListOf<Workspace>()
+        val bookings = calendarRepository.findAll()
+        findAllByTag(tag).forEach {
+            if (bookings.none { booking ->
+                booking.beginBooking.isBefore(endTimestamp) && booking.endBooking.isAfter(beginTimestamp)
+            }) {
+                freeWorkspaces.add(it)
+            }
+        }
+        return freeWorkspaces
     }
 
     /**