Merge pull request #440 from DSM-PICK/develop

merge to main

Author: ByunDohwi

src/main/kotlin/dsm/pick2024/domain/attendance/domain/Attendance.kt

@@ -20,4 +20,10 @@ data class Attendance(
     val period8: AttendanceStatus,
     val period9: AttendanceStatus,
     val period10: AttendanceStatus
-)
+
+) {
+
+    fun updateClub(clubName: String, floor: Int, place: String): Attendance {
+        return this.copy(club = clubName, floor = floor, place = place)
+    }
+}

src/main/kotlin/dsm/pick2024/domain/attendance/persistence/AttendancePersistenceAdapter.kt

@@ -60,4 +60,7 @@ class AttendancePersistenceAdapter(
             )
             .fetch()
             .map { attendanceMapper.toDomain(it) }
+
+    override fun findByStudentNum(grade: Int, classNum: Int, num: Int): Attendance? =
+        attendanceJpaRepository.findByGradeAndClassNumAndNum(grade, classNum, num).let { attendanceMapper.toDomain(it) }
 }

src/main/kotlin/dsm/pick2024/domain/attendance/persistence/repository/AttendanceRepository.kt

@@ -14,4 +14,6 @@ interface AttendanceRepository : Repository<AttendanceJpaEntity, UUID> {
     fun findAll(): List<AttendanceJpaEntity>
 
     fun findByFloor(floor: Int): List<AttendanceJpaEntity>
+
+    fun findByGradeAndClassNumAndNum(grade: Int, classNum: Int, number: Int): AttendanceJpaEntity
 }

src/main/kotlin/dsm/pick2024/domain/attendance/port/out/QueryAttendancePort.kt

@@ -12,6 +12,12 @@ interface QueryAttendancePort {
         classNum: Int
     ): List<Attendance>
 
+    fun findByStudentNum(
+        grade: Int,
+        classNum: Int,
+        num: Int
+    ): Attendance?
+
     fun findByClub(club: String): List<Attendance>?
 
     fun findByUserId(userId: UUID): Attendance?

src/main/kotlin/dsm/pick2024/domain/user/exception/NotExtensionXslException.kt

@@ -0,0 +1,8 @@
+package dsm.pick2024.domain.user.exception
+
+import dsm.pick2024.global.error.exception.ErrorCode
+import dsm.pick2024.global.error.exception.PickException
+
+object NotExtensionXslException : PickException(
+    ErrorCode.NOT_EXTENSION_XSL
+)

src/main/kotlin/dsm/pick2024/domain/user/port/in/UpdateUserClubFromExcelUseCase.kt

@@ -0,0 +1,7 @@
+package dsm.pick2024.domain.user.port.`in`
+
+import org.springframework.web.multipart.MultipartFile
+
+interface UpdateUserClubFromExcelUseCase {
+    fun updateUserClubFromExcel(file: MultipartFile)
+}

src/main/kotlin/dsm/pick2024/domain/user/presentation/UserController.kt

@@ -1,11 +1,6 @@
 package dsm.pick2024.domain.user.presentation
 
-import dsm.pick2024.domain.user.port.`in`.LoginUseCase
-import dsm.pick2024.domain.user.port.`in`.QueryUserAllUseCase
-import dsm.pick2024.domain.user.port.`in`.QueryUserDetailsInfoUseCase
-import dsm.pick2024.domain.user.port.`in`.QueryUserSimpleInfoUseCase
-import dsm.pick2024.domain.user.port.`in`.UploadUserProfileUseCase
-import dsm.pick2024.domain.user.port.`in`.UserTokenRefreshUseCase
+import dsm.pick2024.domain.user.port.`in`.*
 import dsm.pick2024.domain.user.presentation.dto.request.UserLoginRequest
 import dsm.pick2024.global.security.jwt.dto.TokenResponse
 import io.swagger.v3.oas.annotations.Operation
@@ -30,7 +25,8 @@ class UserController(
     private val queryUserSimpleInfoUseCase: QueryUserSimpleInfoUseCase,
     private val queryUserDetailsInfoUseCase: QueryUserDetailsInfoUseCase,
     private val queryUserAllUseCase: QueryUserAllUseCase,
-    private val uploadUserProfileUseCase: UploadUserProfileUseCase
+    private val uploadUserProfileUseCase: UploadUserProfileUseCase,
+    private val updateUserClubFromExcelUseCase: UpdateUserClubFromExcelUseCase
 ) {
     @Operation(summary = "유저 로그인 API")
     @PostMapping("/login")
@@ -59,4 +55,10 @@ class UserController(
     @Operation(summary = "유저 프로필 업로드 API")
     @PatchMapping("/profile")
     fun upload(@RequestParam("file")file: MultipartFile) = uploadUserProfileUseCase.uploadUserProfile(file)
+
+    @Operation(summary = "엑셀 파일 동아리 정보 업데이트 API")
+    @PostMapping("/club")
+    fun updateClub(@RequestParam("file")file: MultipartFile) = updateUserClubFromExcelUseCase.updateUserClubFromExcel(
+        file
+    )
 }

src/main/kotlin/dsm/pick2024/domain/user/presentation/dto/request/UpdateUserClubFromExcelRequest.kt

@@ -0,0 +1,7 @@
+package dsm.pick2024.domain.user.presentation.dto.request
+
+import org.springframework.web.multipart.MultipartFile
+
+data class UpdateUserClubFromExcelRequest(
+    val excel: MultipartFile
+)

src/main/kotlin/dsm/pick2024/domain/user/service/UpdateUserClubFromExcelService.kt

@@ -0,0 +1,72 @@
+package dsm.pick2024.domain.user.service
+
+import dsm.pick2024.domain.attendance.port.out.QueryAttendancePort
+import dsm.pick2024.domain.attendance.port.out.SaveAttendancePort
+import dsm.pick2024.domain.user.exception.NotExtensionXslException
+import dsm.pick2024.domain.user.port.`in`.UpdateUserClubFromExcelUseCase
+import org.apache.commons.compress.utils.FileNameUtils
+import org.apache.poi.hssf.usermodel.HSSFWorkbook
+import org.apache.poi.ss.usermodel.Row
+import org.apache.poi.ss.usermodel.Sheet
+import org.apache.poi.ss.usermodel.Workbook
+import org.apache.poi.xssf.usermodel.XSSFWorkbook
+import org.springframework.stereotype.Service
+import org.springframework.web.multipart.MultipartFile
+import javax.transaction.Transactional
+
+@Service
+class UpdateUserClubFromExcelService(
+    private val queryAttendancePort: QueryAttendancePort,
+    private val saveAttendancePort: SaveAttendancePort
+) : UpdateUserClubFromExcelUseCase {
+    val STUDENT_NUM_INDEX = 1
+    val STUDENT_CULB_INDEX = 3
+    val STUDENT_PLACE_INDEX = 6
+    val STUDENT_FLOOR_INDEX = 7
+    val START_DATA_INDEX = 2
+
+    @Transactional
+    override fun updateUserClubFromExcel(file: MultipartFile) {
+        val extension = FileNameUtils.getExtension(file.originalFilename!!).lowercase()
+
+        if (extension != "xls" && extension != "xlsx") {
+            throw NotExtensionXslException
+        }
+
+        var excel: Workbook? = null
+        try {
+            if (extension == "xlsx") {
+                excel = XSSFWorkbook(file.inputStream)
+            } else {
+                excel = HSSFWorkbook(file.inputStream)
+            }
+
+            val worksheet: Sheet = excel.getSheetAt(0)
+
+            for (i in START_DATA_INDEX until worksheet.physicalNumberOfRows) {
+                val row: Row = worksheet.getRow(i)
+                val studentNum = row.getCell(STUDENT_NUM_INDEX).toString().trim()
+                val clubName = row.getCell(STUDENT_CULB_INDEX).toString().trim()
+                val floor = row.getCell(STUDENT_FLOOR_INDEX).toString().trim()
+                val place = row.getCell(STUDENT_PLACE_INDEX).toString().trim()
+                if (studentNum != "" && clubName != "" && floor != "") {
+                    updateClub(
+                        studentNum.substring(0, 1).toInt(),
+                        studentNum.substring(1, 2).toInt(),
+                        studentNum.substring(2, 4).toInt(),
+                        clubName,
+                        floor.substring(0, 1).toInt(),
+                        place
+                    )
+                }
+            }
+        } finally {
+            excel?.close()
+        }
+    }
+
+    private fun updateClub(grade: Int, classNum: Int, num: Int, clubName: String, floor: Int, place: String) {
+        val attendance = queryAttendancePort.findByStudentNum(grade, classNum, num)
+        attendance?.updateClub(clubName, floor, place)?.let { saveAttendancePort.save(it) }
+    }
+}

src/main/kotlin/dsm/pick2024/global/config/security/SecurityConfig.kt

@@ -46,6 +46,7 @@ class SecurityConfig(
             ).permitAll()
             .antMatchers(
                 HttpMethod.POST,
+                "/user/club",
                 "/after/**",
                 "/meal",
                 "/notice",