diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml index cd9e77ec1..f94818c57 100644 --- a/.github/workflows/dev-cd.yml +++ b/.github/workflows/dev-cd.yml @@ -37,7 +37,7 @@ jobs: region: ${{ secrets.AWS_REGION }} - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: ${{ secrets.ECR_DEV_REPOSITORY }} username: ${{ steps.ecr.outputs.username }} diff --git a/.github/workflows/prod-cd.yml b/.github/workflows/prod-cd.yml index 9b38f72cf..5f78205ec 100644 --- a/.github/workflows/prod-cd.yml +++ b/.github/workflows/prod-cd.yml @@ -36,7 +36,7 @@ jobs: region: ${{ secrets.AWS_REGION }} - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: ${{ secrets.ECR_REPOSITORY }} username: ${{ steps.ecr.outputs.username }} diff --git a/dms-infrastructure/src/main/kotlin/team/aliens/dms/global/security/SecurityConfiguration.kt b/dms-infrastructure/src/main/kotlin/team/aliens/dms/global/security/SecurityConfiguration.kt index 982d2efee..b1ff1a07a 100644 --- a/dms-infrastructure/src/main/kotlin/team/aliens/dms/global/security/SecurityConfiguration.kt +++ b/dms-infrastructure/src/main/kotlin/team/aliens/dms/global/security/SecurityConfiguration.kt @@ -139,7 +139,7 @@ class SecurityConfiguration( .antMatchers(HttpMethod.POST, "/study-rooms/time-slots").hasAuthority(MANAGER.name) .antMatchers(HttpMethod.PATCH, "/study-rooms/time-slots/{time-slot-id}").hasAuthority(MANAGER.name) .antMatchers(HttpMethod.DELETE, "/study-rooms/time-slots/{time-slot-id}").hasAuthority(MANAGER.name) - .antMatchers(HttpMethod.POST, "/study-rooms/students/file").hasAuthority(MANAGER.name) + .antMatchers(HttpMethod.GET, "/study-rooms/students/file").hasAuthority(MANAGER.name) // /remains .antMatchers(HttpMethod.PUT, "/remains/available-time").hasAuthority(MANAGER.name) diff --git a/dms-presentation/src/main/kotlin/team/aliens/dms/domain/studyroom/StudyRoomWebAdapter.kt b/dms-presentation/src/main/kotlin/team/aliens/dms/domain/studyroom/StudyRoomWebAdapter.kt index 66d288419..e4bd8e5d0 100644 --- a/dms-presentation/src/main/kotlin/team/aliens/dms/domain/studyroom/StudyRoomWebAdapter.kt +++ b/dms-presentation/src/main/kotlin/team/aliens/dms/domain/studyroom/StudyRoomWebAdapter.kt @@ -1,5 +1,9 @@ package team.aliens.dms.domain.studyroom +import java.util.UUID +import javax.servlet.http.HttpServletResponse +import javax.validation.Valid +import javax.validation.constraints.NotNull import org.springframework.http.HttpStatus import org.springframework.validation.annotation.Validated import org.springframework.web.bind.annotation.DeleteMapping @@ -55,10 +59,6 @@ import team.aliens.dms.domain.studyroom.usecase.UnApplySeatUseCase import team.aliens.dms.domain.studyroom.usecase.UpdateAvailableTimeUseCase import team.aliens.dms.domain.studyroom.usecase.UpdateStudyRoomUseCase import team.aliens.dms.domain.studyroom.usecase.UpdateTimeSlotUseCase -import java.util.UUID -import javax.servlet.http.HttpServletResponse -import javax.validation.Valid -import javax.validation.constraints.NotNull @Validated @RequestMapping("/study-rooms") @@ -282,7 +282,7 @@ class StudyRoomWebAdapter( removeTimeSlotUseCase.execute(timeSlotId!!) } - @PostMapping("/students/file") + @GetMapping("/students/file") fun exportStudyRoomStudentsApplicationStatus( @RequestPart file: MultipartFile?, httpResponse: HttpServletResponse