Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,19 +1,32 @@
package picklab.backend.activity.application.model

import io.swagger.v3.oas.annotations.media.Schema
import picklab.backend.activity.domain.enums.RecruitmentEndType
import java.time.LocalDate

data class ActivityItemWithBookmark(
@field:Schema(description = "활동 ID")
val id: Long,
@field:Schema(description = "활동명")
val title: String,
@field:Schema(description = "주최기관/단체명")
val organization: String?,
@field:Schema(description = "주최기관 유형")
val organizerType: String,
@field:Schema(description = "활동 시작일")
val startDate: LocalDate,
@field:Schema(description = "활동 유형 (EXTRACURRICULAR, COMPETITION, SEMINAR, EDUCATION)")
val category: String,
@field:Schema(description = "직무 태그 목록")
val jobTags: List<String>,
@field:Schema(description = "활동 썸네일 이미지 URL")
val thumbnailUrl: String?,
@field:Schema(description = "조회수")
val viewCount: Long,
@field:Schema(description = "모집 종료 유형 (FIXED: 날짜 지정, ALWAYS_OPEN: 상시모집, CLOSE_ON_HIRE: 채용시마감)")
val recruitmentEndType: RecruitmentEndType,
@field:Schema(description = "모집 마감까지 남은 일수 (상시모집·채용시마감은 null)")
val dDay: Long?,
@field:Schema(description = "북마크 여부")
val isBookmarked: Boolean,
)
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import picklab.backend.archive.domain.service.ArchiveReferenceUrlService
import picklab.backend.archive.domain.service.ArchiveService
import picklab.backend.archive.domain.service.ArchiveUploadFileUrlService
import picklab.backend.archive.entrypoint.request.ArchiveCreateRequest
import picklab.backend.archive.entrypoint.request.ArchiveUpdateRequest
import picklab.backend.archive.entrypoint.request.ArchiveRecordUpdateRequest
import picklab.backend.archive.entrypoint.request.ArchiveStatusUpdateRequest
import picklab.backend.archive.entrypoint.response.ArchiveActivityResponse
import picklab.backend.common.model.MemberPrincipal
import picklab.backend.file.application.FileManagementService
Expand Down Expand Up @@ -53,9 +54,9 @@ class ArchiveUseCase(
}

@Transactional
fun updateArchive(
fun updateArchiveStatus(
archiveId: Long,
request: ArchiveUpdateRequest,
request: ArchiveStatusUpdateRequest,
memberPrincipal: MemberPrincipal,
) {
val member = memberService.findActiveMember(memberPrincipal.memberId)
Expand All @@ -69,6 +70,40 @@ class ArchiveUseCase(
archiveService.save(archive)
}

@Transactional
fun updateArchiveRecord(
archiveId: Long,
request: ArchiveRecordUpdateRequest,
memberPrincipal: MemberPrincipal,
) {
val member = memberService.findActiveMember(memberPrincipal.memberId)
val archive = archiveService.mustFindByIdAndMember(archiveId, member)

val finalFileUrls =
fileManagementService.processUpdatedFileUrls(
fileUrls = request.fileUrls,
memberId = member.id,
activityId = archive.activity.id,
category = "archive",
)

archive.updateRecord(
activityRecord = request.activityRecord,
role = request.role,
detailRole = request.detailRole,
userStartDate = request.startDate,
userEndDate = request.endDate,
customRole = request.customRole,
)
archiveService.save(archive)

archiveReferenceUrlService.deleteByArchive(archive)
archiveUploadFileUrlService.deleteByArchive(archive)

archiveReferenceUrlService.saveAll(request.referenceUrls.map { url -> ArchiveReferenceUrl(archive, url) })
archiveUploadFileUrlService.saveAll(finalFileUrls.map { url -> ArchiveUploadFileUrl(archive, url) })
}

@Transactional(readOnly = true)
fun getArchiveList(
activityType: ActivityType?,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,21 @@ class Archive(
this.activityProgressStatus = activityProgressStatus
this.passOrFailStatus = passOrFailStatus
}

fun updateRecord(
activityRecord: String,
role: RoleType,
detailRole: DetailRoleType,
userStartDate: LocalDate,
userEndDate: LocalDate,
customRole: String?,
) {
this.activityRecord = activityRecord
this.role = role
this.detailRole = detailRole
this.userStartDate = userStartDate
this.userEndDate = userEndDate
this.customRole = customRole
this.writeStatus = WriteStatus.COMPLETED
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ package picklab.backend.archive.domain.repository

import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.stereotype.Repository
import picklab.backend.archive.domain.entity.Archive
import picklab.backend.archive.domain.entity.ArchiveReferenceUrl

@Repository
interface ArchiveReferenceUrlRepository : JpaRepository<ArchiveReferenceUrl, Long>
interface ArchiveReferenceUrlRepository : JpaRepository<ArchiveReferenceUrl, Long> {
fun deleteByArchive(archive: Archive)
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ package picklab.backend.archive.domain.repository

import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.stereotype.Repository
import picklab.backend.archive.domain.entity.Archive
import picklab.backend.archive.domain.entity.ArchiveUploadFileUrl

@Repository
interface ArchiveUploadFileUrlRepository : JpaRepository<ArchiveUploadFileUrl, Long>
interface ArchiveUploadFileUrlRepository : JpaRepository<ArchiveUploadFileUrl, Long> {
fun deleteByArchive(archive: Archive)
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package picklab.backend.archive.domain.service

import org.springframework.stereotype.Service
import picklab.backend.archive.domain.entity.Archive
import picklab.backend.archive.domain.entity.ArchiveReferenceUrl
import picklab.backend.archive.domain.repository.ArchiveReferenceUrlRepository

Expand All @@ -11,4 +12,8 @@ class ArchiveReferenceUrlService(
fun saveAll(referenceUrls: Collection<ArchiveReferenceUrl>) {
archiveReferenceUrlRepository.saveAll(referenceUrls)
}

fun deleteByArchive(archive: Archive) {
archiveReferenceUrlRepository.deleteByArchive(archive)
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package picklab.backend.archive.domain.service

import org.springframework.stereotype.Service
import picklab.backend.archive.domain.entity.Archive
import picklab.backend.archive.domain.entity.ArchiveUploadFileUrl
import picklab.backend.archive.domain.repository.ArchiveUploadFileUrlRepository

Expand All @@ -11,4 +12,8 @@ class ArchiveUploadFileUrlService(
fun saveAll(uploadedFileUrls: Collection<ArchiveUploadFileUrl>) {
archiveUploadFileUrlRepository.saveAll(uploadedFileUrls)
}

fun deleteByArchive(archive: Archive) {
archiveUploadFileUrlRepository.deleteByArchive(archive)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import org.springframework.web.bind.annotation.RequestParam
import picklab.backend.activity.domain.enums.ActivityType
import picklab.backend.archive.domain.enums.ArchiveSortType
import picklab.backend.archive.entrypoint.request.ArchiveCreateRequest
import picklab.backend.archive.entrypoint.request.ArchiveUpdateRequest
import picklab.backend.archive.entrypoint.request.ArchiveRecordUpdateRequest
import picklab.backend.archive.entrypoint.request.ArchiveStatusUpdateRequest
import picklab.backend.archive.entrypoint.response.ArchiveActivityResponse
import picklab.backend.common.model.MemberPrincipal
import picklab.backend.common.model.ResponseWrapper
Expand All @@ -35,19 +36,35 @@ interface ArchiveApi {
): ResponseEntity<ResponseWrapper<Unit>>

@Operation(
summary = "아카이브 정보 수정",
description = "아카이브 정보를 수정 합니다",
summary = "아카이브 상태 수정",
description = "아카이브의 활동 진행 상태 및 합불 여부를 수정합니다",
)
@ApiResponses(
value = [
ApiResponse(responseCode = "200", description = "아카이브 수정에 성공했습니다."),
ApiResponse(responseCode = "200", description = "아카이브 상태 수정에 성공했습니다."),
ApiResponse(responseCode = "404", description = "아카이브 정보를 찾을 수 없습니다."),
],
)
fun update(
fun updateStatus(
@AuthenticationPrincipal member: MemberPrincipal,
@PathVariable archiveId: Long,
@RequestBody request: ArchiveUpdateRequest,
@RequestBody request: ArchiveStatusUpdateRequest,
): ResponseEntity<ResponseWrapper<Unit>>

@Operation(
summary = "아카이브 기록 내용 수정",
description = "아카이브의 활동 기록 내용(역할, 파일, 연관 URL 등)을 작성하거나 수정합니다",
)
@ApiResponses(
value = [
ApiResponse(responseCode = "200", description = "아카이브 기록 내용 수정에 성공했습니다."),
ApiResponse(responseCode = "404", description = "아카이브 정보를 찾을 수 없습니다."),
],
)
fun updateRecord(
@AuthenticationPrincipal member: MemberPrincipal,
@PathVariable archiveId: Long,
@RequestBody request: ArchiveRecordUpdateRequest,
): ResponseEntity<ResponseWrapper<Unit>>

@Operation(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import picklab.backend.activity.domain.enums.ActivityType
import picklab.backend.archive.application.ArchiveUseCase
import picklab.backend.archive.domain.enums.ArchiveSortType
import picklab.backend.archive.entrypoint.request.ArchiveCreateRequest
import picklab.backend.archive.entrypoint.request.ArchiveUpdateRequest
import picklab.backend.archive.entrypoint.request.ArchiveRecordUpdateRequest
import picklab.backend.archive.entrypoint.request.ArchiveStatusUpdateRequest
import picklab.backend.archive.entrypoint.response.ArchiveActivityResponse
import picklab.backend.common.model.MemberPrincipal
import picklab.backend.common.model.ResponseWrapper
Expand All @@ -32,16 +33,26 @@ class ArchiveController(
return ResponseEntity.ok(ResponseWrapper.success(SuccessCode.CREATE_ARCHIVE_SUCCESS))
}

@PatchMapping("/v1/archive/{archiveId}")
override fun update(
@PatchMapping("/v1/archive/{archiveId}/status")
override fun updateStatus(
@AuthenticationPrincipal member: MemberPrincipal,
@PathVariable archiveId: Long,
@RequestBody request: ArchiveUpdateRequest,
@RequestBody request: ArchiveStatusUpdateRequest,
): ResponseEntity<ResponseWrapper<Unit>> {
archiveUseCase.updateArchive(archiveId, request, member)
archiveUseCase.updateArchiveStatus(archiveId, request, member)
return ResponseEntity.ok(ResponseWrapper.success(SuccessCode.UPDATE_ARCHIVE_SUCCESS))
}

@PatchMapping("/v1/archive/{archiveId}/record")
override fun updateRecord(
@AuthenticationPrincipal member: MemberPrincipal,
@PathVariable archiveId: Long,
@RequestBody request: ArchiveRecordUpdateRequest,
): ResponseEntity<ResponseWrapper<Unit>> {
archiveUseCase.updateArchiveRecord(archiveId, request, member)
return ResponseEntity.ok(ResponseWrapper.success(SuccessCode.UPDATE_ARCHIVE_RECORD_SUCCESS))
}

@GetMapping("/v1/archive")
override fun getList(
@AuthenticationPrincipal member: MemberPrincipal,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package picklab.backend.archive.entrypoint.request

import io.swagger.v3.oas.annotations.media.Schema
import picklab.backend.archive.domain.enums.DetailRoleType
import picklab.backend.archive.domain.enums.RoleType
import java.time.LocalDate

class ArchiveRecordUpdateRequest(
@field:Schema(description = "활동 기록")
val activityRecord: String,
@field:Schema(description = "활동 역할")
val role: RoleType,
@field:Schema(description = "상세 역할")
val detailRole: DetailRoleType,
@field:Schema(description = "상세 역할에서 기타를 선택하여 직접 입력한 역할")
val customRole: String?,
@field:Schema(description = "활동 파일 URLs (기존 영구 URL + 신규 임시 URL 혼용 가능)")
val fileUrls: List<String>,
@field:Schema(description = "활동 연관 URLs")
val referenceUrls: List<String>,
@field:Schema(description = "활동 시작일")
val startDate: LocalDate,
@field:Schema(description = "활동 종료일")
val endDate: LocalDate,
)
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema
import picklab.backend.archive.domain.enums.PassOrFailStatus
import picklab.backend.archive.domain.enums.ProgressStatus

class ArchiveUpdateRequest(
class ArchiveStatusUpdateRequest(
@field:Schema(description = "활동 진행 상태")
val activityProgressStatus: ProgressStatus,
@field:Schema(description = "합격/불합격 상태")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import java.time.LocalDate
data class ArchiveActivityResponse(
@field:Schema(description = "아카이브 ID")
val id: Long,
@field:Schema(description = "원본 활동 ID")
val activityId: Long,
@field:Schema(description = "활동 썸네일 이미지 URL")
val activityThumbnailUrl: String?,
@field:Schema(description = "활동 유형")
Expand All @@ -27,6 +29,7 @@ data class ArchiveActivityResponse(
fun from(archive: Archive): ArchiveActivityResponse =
ArchiveActivityResponse(
id = archive.id,
activityId = archive.activity.id,
activityThumbnailUrl = archive.activity.activityThumbnailUrl,
activityType = archive.activityType.name,
title = archive.activity.title,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ enum class SuccessCode(

// Archive 관련
CREATE_ARCHIVE_SUCCESS(HttpStatus.OK, "아카이브 생성에 성공했습니다."),
UPDATE_ARCHIVE_SUCCESS(HttpStatus.OK, "아카이브 수정에 성공했습니다."),
UPDATE_ARCHIVE_SUCCESS(HttpStatus.OK, "아카이브 상태 수정에 성공했습니다."),
UPDATE_ARCHIVE_RECORD_SUCCESS(HttpStatus.OK, "아카이브 기록 내용 수정에 성공했습니다."),
GET_ARCHIVE_LIST(HttpStatus.OK, "아카이브 목록 조회에 성공했습니다."),

// Notification 관련
Expand Down
Loading
Loading