From 531c778c1377607ebfe0d0dd711de2f97a3e0f96 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Tue, 10 Sep 2024 13:20:01 +0800 Subject: [PATCH] for testing email functions --- .../common/mail/service/MailReminderService.kt | 13 +++++++------ .../tsms/modules/common/mail/web/MailController.kt | 14 +++++++++++--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt b/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt index 73f8f68..ce02db3 100644 --- a/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt +++ b/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt @@ -39,7 +39,8 @@ open class MailReminderService( val teamRepository: TeamRepository ) { protected val logger: Log = LogFactory.getLog(javaClass) - + private val FULLTIME = "FT" + private val PARTTIME = "PT" private val dateFormat: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") private fun isSettingsConfigValid(): Boolean { @@ -118,7 +119,7 @@ open class MailReminderService( } val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(filteredLastMonthDays.first(),filteredLastMonthDays.last()) - val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse("Full Time") + val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse(FULLTIME) val teams = teamRepository.findAll().filter { team -> team.deleted == false } for (team in teams) { @@ -176,7 +177,7 @@ open class MailReminderService( //get data val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(firstDay, today) - val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse("Full Time") + val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse(FULLTIME) val teams = teamRepository.findAll().filter { team -> team.deleted == false } val dateList = generateSequence(firstDay) { it.plusDays(1) } @@ -267,7 +268,7 @@ open class MailReminderService( } val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(sevenDaysBefore, fourDaysBefore) - val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse("Full Times") // Full Time? FT? etc + val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse(FULLTIME) // FT? FT? etc val staffIds: List = staffs.map { it.id as Long } val timesheetByIdAndRecord = timesheet.groupBy { it.staff?.id to it.recordDate } @@ -337,7 +338,7 @@ open class MailReminderService( val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(sevenDaysBefore,fourDaysBefore) // just getting my own staff record // change it back later - val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse("Full Times") + val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse(FULLTIME) val staffIds: List = staffs.map { it.id as Long } val timesheetByIdAndRecord = timesheet.groupBy { it.staff?.id to it.recordDate } @@ -392,7 +393,7 @@ open class MailReminderService( ) ) // .addTo(InternetAddress(emailAddress)) - .addTo(InternetAddress("derek.chan@2fi-solutions.com.hk")) + .addTo(InternetAddress("")) // .addTo(toList) .addCc(cc) .addBcc(bcc) diff --git a/src/main/java/com/ffii/tsms/modules/common/mail/web/MailController.kt b/src/main/java/com/ffii/tsms/modules/common/mail/web/MailController.kt index 4a1332a..19ab589 100644 --- a/src/main/java/com/ffii/tsms/modules/common/mail/web/MailController.kt +++ b/src/main/java/com/ffii/tsms/modules/common/mail/web/MailController.kt @@ -31,8 +31,16 @@ class MailController( return mailService.saveMail(mailSave) } - @GetMapping("/test") - fun testMail() { - mailReminderService.sendTimesheetReminderTest() + @GetMapping("/testEveryone") + fun testEveryone() { + mailReminderService.sendTimesheetReminder() + } + @GetMapping("/test7th") + fun test7th() { + mailReminderService.sendTimesheetToTeamLead7TH() + } + @GetMapping("/test15th") + fun test15th() { + mailReminderService.sendTimesheetToTeamLead15TH() } } \ No newline at end of file