v1.4.4

team-aliens · Sep 21, 2024 · e041865 · e041865
2 parents 1ea46c3 + 3596768
commit e041865
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 12 deletions.
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/file/service/WriteFileService.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/file/service/WriteFileService.kt
@@ -30,5 +30,5 @@ interface WriteFileService {
         studentSeats: List<StudentSeatInfo>
     ): ByteArray
 
-    fun writeOutingApplicationExcelFile(outingApplicationVos: List<OutingApplicationVO>): ByteArray
+    fun writeOutingApplicationExcelFile(outingApplicationExcelVos: List<OutingApplicationVO>): ByteArray
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/file/service/WriteFileServiceImpl.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/file/service/WriteFileServiceImpl.kt
@@ -39,6 +39,6 @@ class WriteFileServiceImpl(
         studentSeats: List<StudentSeatInfo>
     ) = writeFilePort.writeStudyRoomApplicationStatusExcelFile(timeSlots, studentSeats)
 
-    override fun writeOutingApplicationExcelFile(outingApplicationVos: List<OutingApplicationVO>) =
-        writeFilePort.writeOutingApplicationExcelFile(outingApplicationVos)
+    override fun writeOutingApplicationExcelFile(outingApplicationExcelVos: List<OutingApplicationVO>) =
+        writeFilePort.writeOutingApplicationExcelFile(outingApplicationExcelVos)
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/file/spi/WriteFilePort.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/file/spi/WriteFilePort.kt
@@ -30,5 +30,5 @@ interface WriteFilePort {
         studentSeats: List<StudentSeatInfo>
     ): ByteArray
 
-    fun writeOutingApplicationExcelFile(outingApplicationVos: List<OutingApplicationVO>): ByteArray
+    fun writeOutingApplicationExcelFile(outingApplicationExcelVos: List<OutingApplicationVO>): ByteArray
 }
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/GetOutingServiceImpl.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/GetOutingServiceImpl.kt
@@ -14,6 +14,7 @@ import team.aliens.dms.domain.outing.spi.QueryOutingTypePort
 import team.aliens.dms.domain.outing.spi.vo.CurrentOutingApplicationVO
 import team.aliens.dms.domain.outing.spi.vo.OutingCompanionDetailsVO
 import team.aliens.dms.domain.outing.spi.vo.OutingHistoryVO
+
 import java.time.DayOfWeek
 import java.time.LocalDate
 import java.util.UUID

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt
@@ -9,6 +9,8 @@ open class OutingApplicationVO(
     val studentGrade: Int,
     val studentClassRoom: Int,
     val studentNumber: Int,
+    val reason: String,
+    val outingType: String,
     val outingDate: LocalDate,
     val outingTime: LocalTime,
     val arrivalTime: LocalTime,

diff --git a/...c/main/kotlin/team/aliens/dms/domain/outing/usecase/ExportAllOutingApplicationsUseCase.kt b/...c/main/kotlin/team/aliens/dms/domain/outing/usecase/ExportAllOutingApplicationsUseCase.kt
@@ -19,9 +19,10 @@ class ExportAllOutingApplicationsUseCase(
 ) {
 
     fun execute(start: LocalDate, end: LocalDate): ExportAllOutingApplicationsResponse {
-        val outingApplicationVOs = outingService.getAllOutingApplicationVOsBetweenStartAndEnd(start, end)
 
-        val file = fileService.writeOutingApplicationExcelFile(outingApplicationVOs)
+        val outingApplicationExcelVOs = outingService.getAllOutingApplicationVOsBetweenStartAndEnd(start, end)
+
+        val file = fileService.writeOutingApplicationExcelFile(outingApplicationExcelVOs)
 
         val user = userService.getCurrentUser()
         val school = schoolService.getSchoolById(user.schoolId)

diff --git a/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt b/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt
@@ -247,14 +247,15 @@ class ExcelAdapter : ParseFilePort, WriteFilePort, ExcelPort() {
         )
     }
 
-    override fun writeOutingApplicationExcelFile(outingApplicationVos: List<OutingApplicationVO>): ByteArray {
-        val attributes = mutableListOf("학번", "이름", "외출 시간", "도착 시간", "외출 서명", "복귀 확인")
+    override fun writeOutingApplicationExcelFile(outingApplicationExcelVos: List<OutingApplicationVO>): ByteArray {
+        val attributes = mutableListOf("ㅤ학번ㅤ", "ㅤ이름ㅤ", "외출 사유", "외출 시간", "도착 시간", "외출 확인", "복귀 확인")
 
-        val outingApplicationInfoSet = outingApplicationVos.map { outingApplication ->
+        val outingApplicationInfoSet = outingApplicationExcelVos.map { outingApplication ->
             val outingApplicationInfoList = mutableListOf(
                 listOf(
                     outingApplication.studentGcn,
                     outingApplication.studentName,
+                    outingApplication.reason,
                     outingApplication.outingTime.toString(),
                     outingApplication.arrivalTime.toString(),
                     null,
@@ -268,6 +269,8 @@ class ExcelAdapter : ParseFilePort, WriteFilePort, ExcelPort() {
                         listOf(
                             outingCompanions.studentGcn,
                             outingCompanions.studentName,
+                            null,
+                            null,
                             outingApplication.outingTime.toString(),
                             outingApplication.arrivalTime.toString(),
                             null,
@@ -283,7 +286,7 @@ class ExcelAdapter : ParseFilePort, WriteFilePort, ExcelPort() {
             dataListSet = outingApplicationInfoSet,
             colors = listOf(
                 IndexedColors.WHITE,
-                IndexedColors.GREY_25_PERCENT
+                IndexedColors.LIGHT_GREEN
             )
         )
     }

diff --git a/dms-infrastructure/src/main/resources/application.yml b/dms-infrastructure/src/main/resources/application.yml
@@ -48,7 +48,7 @@ fcm:
 
 secret:
   secret-key: ${SECRET_KEY:asdfghgfdsasdfghgfdsasdfghgfdsasdfghgfdsasdfghgfdsasdfghgfdsasdfghgfdsasdfghgfdsasdfghgfdsasdfghgfds}
-  access-exp: 120
+  access-exp: ${ACCESS_EXP:3600}
   refresh-exp: ${REFRESH_EXP:1205600}
 
 open-feign:

diff --git a/...src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt b/...src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt
@@ -2,7 +2,6 @@ package team.aliens.dms.persistence.outing
 
 import com.querydsl.core.group.GroupBy.groupBy
 import com.querydsl.core.group.GroupBy.list
-import com.querydsl.jpa.JPAExpressions.select
 import com.querydsl.jpa.JPAExpressions.selectOne
 import com.querydsl.jpa.impl.JPAQueryFactory
 import org.springframework.data.repository.findByIdOrNull
@@ -66,6 +65,8 @@ class OutingApplicationPersistenceAdapter(
                             studentJpaEntity.grade,
                             studentJpaEntity.classRoom,
                             studentJpaEntity.number,
+                            outingApplicationJpaEntity.reason,
+                            outingApplicationJpaEntity.reason,
                             outingApplicationJpaEntity.outingDate,
                             outingApplicationJpaEntity.outingTime,
                             outingApplicationJpaEntity.arrivalTime,

diff --git a/.../main/kotlin/team/aliens/dms/persistence/outing/repository/vo/QueryOutingApplicationVO.kt b/.../main/kotlin/team/aliens/dms/persistence/outing/repository/vo/QueryOutingApplicationVO.kt
@@ -11,6 +11,8 @@ class QueryOutingApplicationVO @QueryProjection constructor(
     studentGrade: Int,
     studentClassRoom: Int,
     studentNumber: Int,
+    reason: String,
+    outingType: String,
     outingDate: LocalDate,
     outingTime: LocalTime,
     arrivalTime: LocalTime,
@@ -20,6 +22,8 @@ class QueryOutingApplicationVO @QueryProjection constructor(
     studentGrade = studentGrade,
     studentClassRoom = studentClassRoom,
     studentNumber = studentNumber,
+    reason = reason,
+    outingType = outingType,
     outingDate = outingDate,
     outingTime = outingTime,
     arrivalTime = arrivalTime,