From f3fbc381188ab2efa2de8ac0c06779af1125cc3b Mon Sep 17 00:00:00 2001
From: Wayne <wayne.lee@2fi-solutions.com.hk>
Date: Mon, 22 Jul 2024 21:50:41 +0900
Subject: [PATCH] Remove time entry merging

---
 .../modules/timesheet/service/LeaveService.kt     | 10 +---------
 .../timesheet/service/TimesheetsService.kt        | 15 +--------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/timesheet/service/LeaveService.kt b/src/main/java/com/ffii/tsms/modules/timesheet/service/LeaveService.kt
index 02291b6..bdcb0ed 100644
--- a/src/main/java/com/ffii/tsms/modules/timesheet/service/LeaveService.kt
+++ b/src/main/java/com/ffii/tsms/modules/timesheet/service/LeaveService.kt
@@ -39,7 +39,7 @@ open class LeaveService(
             // Replace db leave entries by deleting and then adding back
             leaveRepository.deleteAllByStaffAndRecordDate(currentStaff, entryDate)
 
-            mergeLeaveEntriesByType(leaveEntries).map { leaveEntry ->
+            leaveEntries.map { leaveEntry ->
                 Leave().apply {
                     this.staff = currentStaff
                     this.recordDate = entryDate
@@ -130,12 +130,4 @@ open class LeaveService(
                 )
             } }
     }
-
-    private fun mergeLeaveEntriesByType(entries: List<LeaveEntry>): List<LeaveEntry> {
-        return entries
-            .groupBy { leaveEntry -> leaveEntry.leaveTypeId }
-            .values.map { leaveEntires ->
-                leaveEntires.reduce { acc, leaveEntry -> acc.copy(inputHours = acc.inputHours + leaveEntry.inputHours)  }
-            }
-    }
 }
diff --git a/src/main/java/com/ffii/tsms/modules/timesheet/service/TimesheetsService.kt b/src/main/java/com/ffii/tsms/modules/timesheet/service/TimesheetsService.kt
index 72b3a2a..32bdf90 100644
--- a/src/main/java/com/ffii/tsms/modules/timesheet/service/TimesheetsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/timesheet/service/TimesheetsService.kt
@@ -42,7 +42,7 @@ open class TimesheetsService(
             // Replace db timesheet entries by deleting and then adding back
             timesheetRepository.deleteAllByStaffAndRecordDate(currentStaff, entryDate)
 
-            mergeTimeEntriesByProjectAndTask(timeEntries).map { timeEntry ->
+            timeEntries.map { timeEntry ->
                 val task = timeEntry.taskId?.let { taskRepository.findById(it).getOrNull() }
                 val project = timeEntry.projectId?.let { projectRepository.findById(it).getOrNull() }
                 val projectTask =
@@ -162,19 +162,6 @@ open class TimesheetsService(
             }
     }
 
-    private fun mergeTimeEntriesByProjectAndTask(entries: List<TimeEntry>): List<TimeEntry> {
-        return entries
-            .groupBy { timeEntry -> Pair(timeEntry.projectId, timeEntry.taskId) }
-            .values.map { timeEntries ->
-                timeEntries.reduce { acc, timeEntry ->
-                    acc.copy(
-                        inputHours = (acc.inputHours ?: 0.0) + (timeEntry.inputHours ?: 0.0),
-                        otHours = (acc.otHours ?: 0.0) + (timeEntry.otHours ?: 0.0)
-                    )
-                }
-            }
-    }
-
     @Transactional(rollbackFor = [Exception::class])
     open fun importFile(workbook: Workbook?): String {
         val logger = LogFactory.getLog(javaClass)