Remove submit diff

kir-dev · Oct 2, 2024 · 5573469 · 5573469
1 parent c43c953
commit 5573469
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 107 deletions.
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/app/DebugComponent.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/app/DebugComponent.kt
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/app/DebugComponentController.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/app/DebugComponentController.kt
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormService.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormService.kt
@@ -1,9 +1,7 @@
 package hu.bme.sch.cmsch.component.form
 
 import com.fasterxml.jackson.core.type.TypeReference
-import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import hu.bme.sch.cmsch.component.app.DebugComponent
 import hu.bme.sch.cmsch.component.login.CmschUser
 import hu.bme.sch.cmsch.extending.FormSubmissionListener
 import hu.bme.sch.cmsch.model.RoleType
@@ -26,7 +24,6 @@ open class FormService(
     private val responseRepository: ResponseRepository,
     private val userRepository: UserRepository,
     private val clock: TimeService,
-    private val debugComponent: DebugComponent,
     private val listeners: MutableList<out FormSubmissionListener>,
     private val formComponent: FormComponent,
 ) {
@@ -62,7 +59,7 @@ open class FormService(
         if ((form.minRole.value > user.role.value || form.maxRole.value < user.role.value) && !user.role.isAdmin)
             return FormView(status = FormStatus.NOT_FOUND)
 
-        val now = clock.getTimeInSeconds() + (debugComponent.submitDiff.getValue().toLongOrNull() ?: 0)
+        val now = clock.getTimeInSeconds()
         if (!form.open)
             return FormView(status = FormStatus.NOT_ENABLED)
         if (form.availableFrom > now)

diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TaskApiController.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TaskApiController.kt
@@ -37,16 +37,16 @@ class TaskApiController(
         when (startupPropertyConfig.taskOwnershipMode) {
             OwnershipType.USER -> {
                 user ?: return TasksView()
-                categories = tasks.getCategoriesForUserInTimeRange(user.id, clock.getNowInSeconds(), user.role)
+                categories = tasks.getCategoriesForUserInTimeRange(user.id, clock.getTimeInSeconds(), user.role)
 
                 return TasksView(
                     categories = categories
-                        .filter { clock.inRange(it.availableFrom, it.availableTo, clock.getNowInSeconds()) },
+                        .filter { clock.inRange(it.availableFrom, it.availableTo, clock.getTimeInSeconds()) },
                 )
             }
             OwnershipType.GROUP -> {
                 val groupId = user?.groupId ?: return TasksView( )
-                categories = tasks.getCategoriesForGroupInRange(groupId, clock.getNowInSeconds(), userRole = user.role)
+                categories = tasks.getCategoriesForGroupInRange(groupId, clock.getTimeInSeconds(), userRole = user.role)
 
                 return TasksView(
                     categories = categories

diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TasksService.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TasksService.kt
@@ -1,6 +1,5 @@
 package hu.bme.sch.cmsch.component.task
 
-import hu.bme.sch.cmsch.component.app.DebugComponent
 import hu.bme.sch.cmsch.component.login.CmschUser
 import hu.bme.sch.cmsch.extending.TaskSubmissionListener
 import hu.bme.sch.cmsch.model.RoleType
@@ -29,7 +28,6 @@ open class TasksService(
     private val categories: TaskCategoryRepository,
     private val clock: TimeService,
     private val taskComponent: TaskComponent,
-    private val debugComponent: DebugComponent,
     private val listeners: List<TaskSubmissionListener>,
     private val userRepository: UserRepository,
     private val groupRepository: GroupRepository
@@ -191,7 +189,7 @@ open class TasksService(
         val task = taskRepository.findById(answer.taskId).orElse(null)
             ?: return TaskSubmissionStatus.INVALID_TASK_ID
 
-        val now = clock.getTimeInSeconds() + (debugComponent.submitDiff.getValue().toLongOrNull() ?: 0)
+        val now = clock.getTimeInSeconds()
         if (task.availableFrom > now || task.availableTo < now) {
             return TaskSubmissionStatus.TOO_EARLY_OR_LATE
         }
@@ -219,7 +217,7 @@ open class TasksService(
         val task = taskRepository.findById(answer.taskId).orElse(null)
             ?: return TaskSubmissionStatus.INVALID_TASK_ID
 
-        val now = clock.getTimeInSeconds() + (debugComponent.submitDiff.getValue().toLongOrNull() ?: 0)
+        val now = clock.getTimeInSeconds()
         if (task.availableFrom > now || task.availableTo < now) {
             return TaskSubmissionStatus.TOO_EARLY_OR_LATE
         }

diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/team/TeamService.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/team/TeamService.kt
@@ -280,7 +280,7 @@ open class TeamService(
 
     private fun mapTasks(team: GroupEntity, user: CmschUser): List<TaskCategoryPreview> {
         return tasksService.map { tasks ->
-            tasks.getCategoriesForGroupInRange(team.id, clock.getNowInSeconds(), advertisedOnly = true, user.role)
+            tasks.getCategoriesForGroupInRange(team.id, clock.getTimeInSeconds(), advertisedOnly = true, user.role)
                 .map { TaskCategoryPreview(
                     name = it.name,
                     completed = it.approved,

diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/service/TimeService.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/service/TimeService.kt
@@ -1,6 +1,5 @@
 package hu.bme.sch.cmsch.service
 
-import hu.bme.sch.cmsch.component.app.DebugComponent
 import hu.bme.sch.cmsch.config.StartupPropertyConfig
 import org.springframework.stereotype.Service
 import java.time.ZoneId
@@ -9,10 +8,7 @@ import java.time.format.DateTimeFormatter
 import java.util.*
 
 @Service
-class TimeService(
-    startupPropertyConfig: StartupPropertyConfig,
-    private val debugComponent: DebugComponent
-) {
+class TimeService(startupPropertyConfig: StartupPropertyConfig) {
 
     val timeZone: ZoneId = Objects.requireNonNull(ZoneId.of(startupPropertyConfig.zoneId), "Invalid time zone")
     private val sqlDateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
@@ -21,19 +17,10 @@ class TimeService(
 
     fun getTime() = ZonedDateTime.now(timeZone)?.toInstant()?.toEpochMilli() ?: 0
 
-    fun inRange(availableFrom: Long, availableTo: Long, timeInSeconds: Long): Boolean {
-        val now = timeInSeconds + (debugComponent.submitDiff.getValue().toLongOrNull() ?: 0)
-        return now in availableFrom..availableTo
-    }
+    fun inRange(availableFrom: Long, availableTo: Long, timeInSeconds: Long): Boolean =
+        timeInSeconds in availableFrom..availableTo
 
-    fun isTimePassed(timeToBeAfter: Long, timeInSeconds: Long): Boolean {
-        val now = timeInSeconds + (debugComponent.submitDiff.getValue().toLongOrNull() ?: 0)
-        return now > timeToBeAfter
-    }
-
-    fun getNowInSeconds(): Long {
-        return getTimeInSeconds() + (debugComponent.submitDiff.getValue().toLongOrNull() ?: 0)
-    }
+    fun isTimePassed(timeToBeAfter: Long, timeInSeconds: Long): Boolean = timeInSeconds > timeToBeAfter
 
     fun todayInSqlFormat(): String = ZonedDateTime.now(timeZone).format(sqlDateFormatter)