diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/member/service/ProfessorEventService.kt b/src/main/kotlin/com/wafflestudio/csereal/core/member/service/ProfessorEventService.kt index 29f86501..44da5b19 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/member/service/ProfessorEventService.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/member/service/ProfessorEventService.kt @@ -21,7 +21,7 @@ interface ProfessorEventService { @Service class ProfessorEventServiceImpl( private val professorRepository: ProfessorRepository, - private val labRepository: LabRepository, + private val labRepository: LabRepository ) : ProfessorEventService { @EventListener @Transactional diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/api/req/CreateLabLanguageReqBody.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/api/req/CreateLabLanguageReqBody.kt index 5bbd06c3..4f57fd4c 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/api/req/CreateLabLanguageReqBody.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/api/req/CreateLabLanguageReqBody.kt @@ -1,11 +1,8 @@ package com.wafflestudio.csereal.core.research.api.req -import com.wafflestudio.csereal.core.research.dto.LabProfessorResponse -import com.wafflestudio.csereal.core.resource.attachment.dto.AttachmentResponse - data class CreateLabLanguageReqBody( val ko: CreateLabReqBody, - val en: CreateLabReqBody, + val en: CreateLabReqBody ) data class CreateLabReqBody( diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/api/req/ModifyLabLanguageReqBody.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/api/req/ModifyLabLanguageReqBody.kt index fb35dbd9..2f7607c9 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/api/req/ModifyLabLanguageReqBody.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/api/req/ModifyLabLanguageReqBody.kt @@ -2,7 +2,7 @@ package com.wafflestudio.csereal.core.research.api.req data class ModifyLabLanguageReqBody( val ko: ModifyLabReqBody, - val en: ModifyLabReqBody, + val en: ModifyLabReqBody ) data class ModifyLabReqBody( @@ -15,5 +15,5 @@ data class ModifyLabReqBody( val websiteURL: String?, val groupId: Long?, val professorIds: Set, - val removePdf: Boolean, + val removePdf: Boolean ) diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/api/v1/ResearchController.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/api/v1/ResearchController.kt index 8fc3731c..06cab295 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/api/v1/ResearchController.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/api/v1/ResearchController.kt @@ -5,7 +5,6 @@ import com.wafflestudio.csereal.core.research.dto.LabDto import com.wafflestudio.csereal.core.research.dto.ResearchDto import com.wafflestudio.csereal.core.research.dto.ResearchGroupResponse import com.wafflestudio.csereal.core.research.service.LabService -import com.wafflestudio.csereal.core.research.service.LabServiceImpl import com.wafflestudio.csereal.core.research.service.ResearchSearchService import com.wafflestudio.csereal.core.research.service.ResearchService import jakarta.validation.Valid @@ -19,7 +18,7 @@ import org.springframework.web.bind.annotation.* class ResearchController( private val researchService: ResearchService, private val researchSearchService: ResearchSearchService, - private val labService: LabService, + private val labService: LabService ) { @GetMapping("/groups") fun readAllResearchGroups( @@ -49,7 +48,6 @@ class ResearchController( return ResponseEntity.ok(labService.readLab(labId)) } - @GetMapping("/search/top") fun searchTop( @RequestParam(required = true) keyword: String, diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/api/v2/ResearchController.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/api/v2/ResearchController.kt index 2bece21a..619cffb6 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/api/v2/ResearchController.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/api/v2/ResearchController.kt @@ -22,7 +22,7 @@ import org.springframework.web.multipart.MultipartFile class ResearchController( private val researchService: ResearchService, private val labService: LabService, - private val researchSearchService: ResearchSearchService, + private val researchSearchService: ResearchSearchService ) { // Research APIs @@ -86,14 +86,12 @@ class ResearchController( @RequestParam(required = false, defaultValue = "ko") language: String ): List = labService.readAllLabs(language) - // TODO: Change to Language Unified API @GetMapping("/lab/{labId}") fun readLab( @PathVariable labId: Long ): LabLanguageDto = labService.readLabLanguage(labId) - @AuthenticatedStaff @PostMapping("/lab", consumes = ["multipart/form-data"]) fun createLab( @@ -107,17 +105,23 @@ class ResearchController( @AuthenticatedStaff @PutMapping("/lab/{koreanLabId}/{englishLabId}", consumes = ["multipart/form-data"]) fun updateLab( - @PathVariable @Positive koreanLabId: Long, - @PathVariable @Positive englishLabId: Long, - @Valid @RequestPart("request") request: ModifyLabLanguageReqBody, + @PathVariable @Positive + koreanLabId: Long, + @PathVariable @Positive + englishLabId: Long, + @Valid + @RequestPart("request") + request: ModifyLabLanguageReqBody, @RequestPart("pdf") pdf: MultipartFile? ): LabLanguageDto = labService.updateLabLanguage(koreanLabId, englishLabId, request, pdf) @AuthenticatedStaff @DeleteMapping("/lab/{koreanLabId}/{englishLabId}") fun deleteLab( - @PathVariable @Positive koreanLabId: Long, - @PathVariable @Positive englishLabId: Long, + @PathVariable @Positive + koreanLabId: Long, + @PathVariable @Positive + englishLabId: Long ) { labService.deleteLabLanguage(koreanLabId, englishLabId) } diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/database/LabEntity.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/database/LabEntity.kt index 6a4e5e12..86a1d24d 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/database/LabEntity.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/database/LabEntity.kt @@ -3,7 +3,6 @@ package com.wafflestudio.csereal.core.research.database import com.wafflestudio.csereal.common.config.BaseTimeEntity import com.wafflestudio.csereal.common.enums.LanguageType import com.wafflestudio.csereal.core.member.database.ProfessorEntity -import com.wafflestudio.csereal.core.research.dto.LabDto import com.wafflestudio.csereal.core.research.dto.LabUpdateRequest import com.wafflestudio.csereal.core.resource.attachment.database.AttachmentEntity import jakarta.persistence.* diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchLanguageEntity.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchLanguageEntity.kt index ae574d44..992faadf 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchLanguageEntity.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchLanguageEntity.kt @@ -7,7 +7,7 @@ import jakarta.persistence.* @Entity(name = "research_language") @Table( uniqueConstraints = [ - UniqueConstraint(columnNames = ["korean_id", "english_id", "type"]), + UniqueConstraint(columnNames = ["korean_id", "english_id", "type"]) ] ) class ResearchLanguageEntity( diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchLanguageRepository.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchLanguageRepository.kt index 41d074bf..4e64de5b 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchLanguageRepository.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchLanguageRepository.kt @@ -64,7 +64,7 @@ class ResearchLanguageCustomRepositoryImpl( .join(en).on(researchLanguageEntity.englishId.eq(en.id)) .where( researchLanguageEntity.type.eq( - ResearchRelatedType.LAB, + ResearchRelatedType.LAB ), researchLanguageEntity.koreanId.eq(id).or( researchLanguageEntity.englishId.eq(id) diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/dto/LabLanguageDto.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/dto/LabLanguageDto.kt index 9b484a5d..e7e4348d 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/dto/LabLanguageDto.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/dto/LabLanguageDto.kt @@ -2,5 +2,5 @@ package com.wafflestudio.csereal.core.research.dto data class LabLanguageDto( val ko: LabDto, - val en: LabDto, + val en: LabDto ) diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabCreatedEvent.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabCreatedEvent.kt index 2b9ea428..914ecfe1 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabCreatedEvent.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabCreatedEvent.kt @@ -3,6 +3,5 @@ package com.wafflestudio.csereal.core.research.event data class LabCreatedEvent( val id: Long, val researchId: Long?, - val professorIds: Set, + val professorIds: Set ) - diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabDeletedEvent.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabDeletedEvent.kt index 2c866a0c..95dd8ad8 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabDeletedEvent.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabDeletedEvent.kt @@ -3,5 +3,5 @@ package com.wafflestudio.csereal.core.research.event data class LabDeletedEvent( val id: Long, val researchId: Long?, - val professorIds: Set, + val professorIds: Set ) diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabModifiedEvent.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabModifiedEvent.kt index 63b6bcaa..10186fe3 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabModifiedEvent.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/event/LabModifiedEvent.kt @@ -3,5 +3,5 @@ package com.wafflestudio.csereal.core.research.event data class LabModifiedEvent( val id: Long, val researchIdModified: Pair, - val professorIdsModified: Pair, Set>, + val professorIdsModified: Pair, Set> ) diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/service/LabEventService.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/service/LabEventService.kt index ef3a99e0..7c40f02b 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/service/LabEventService.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/service/LabEventService.kt @@ -19,7 +19,7 @@ interface LabEventService { @Service class LabEventServiceImpl( - private val labRepository: LabRepository, + private val labRepository: LabRepository ) : LabEventService { @EventListener @Transactional diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/service/LabService.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/service/LabService.kt index 474a9ad4..5fb3e562 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/service/LabService.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/service/LabService.kt @@ -55,7 +55,7 @@ class LabServiceImpl( private val researchRepository: ResearchRepository, private val professorRepository: ProfessorRepository, private val endpointProperties: EndpointProperties, - private val applicationEventPublisher: ApplicationEventPublisher, + private val applicationEventPublisher: ApplicationEventPublisher ) : LabService { // TODO: Solve N+1 Problem @Transactional(readOnly = true) @@ -129,7 +129,7 @@ class LabServiceImpl( override fun createLab(language: LanguageType, request: CreateLabReqBody, pdf: MultipartFile?): LabDto { val researchGroup = request.groupId?.let { researchRepository.findByIdOrNull(request.groupId) - ?: throw CserealException.Csereal404("해당 연구그룹을 찾을 수 없습니다.(researchGroupId = ${it})") + ?: throw CserealException.Csereal404("해당 연구그룹을 찾을 수 없습니다.(researchGroupId = $it)") }?.apply { if (this.postType != ResearchType.GROUPS) { throw CserealException.Csereal404("해당 id 연구그룹이 아닙니다.(researchGroupId = ${this.id})") @@ -156,7 +156,7 @@ class LabServiceImpl( tel = request.tel, youtube = request.youtube, research = researchGroup, - professors = professors.toMutableSet(), + professors = professors.toMutableSet() ).apply { pdf?.let { attachmentService.uploadAttachmentInLabEntity(this, it) @@ -171,7 +171,7 @@ class LabServiceImpl( LabCreatedEvent( newSavedLab.id, request.groupId, - request.professorIds, + request.professorIds ) ) @@ -183,7 +183,7 @@ class LabServiceImpl( koreanId: Long, englishId: Long, request: ModifyLabLanguageReqBody, - pdf: MultipartFile?, + pdf: MultipartFile? ): LabLanguageDto { val koLabDto = updateLab(LanguageType.KO, koreanId, request.ko, pdf) val enLabDto = updateLab(LanguageType.EN, englishId, request.en, pdf) @@ -204,7 +204,7 @@ class LabServiceImpl( val oldGroup = labEntity.research val newGroup = request.groupId?.let { researchRepository.findByIdAndPostType(it, ResearchType.GROUPS) - ?: throw CserealException.Csereal404("해당 연구그룹을 찾을 수 없습니다.(researchGroupId = ${it})") + ?: throw CserealException.Csereal404("해당 연구그룹을 찾을 수 없습니다.(researchGroupId = $it)") } val oldProfessors = labEntity.professors @@ -246,7 +246,7 @@ class LabServiceImpl( LabModifiedEvent( labId, oldGroup?.id to newGroup?.id, - oldProfessors.map { it.id }.toSet() to request.professorIds, + oldProfessors.map { it.id }.toSet() to request.professorIds ) ) diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/service/ResearchEventService.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/service/ResearchEventService.kt index a5391d13..190b8e77 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/service/ResearchEventService.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/service/ResearchEventService.kt @@ -21,7 +21,7 @@ interface ResearchEventService { @Service class ResearchEventServiceImpl( private val researchRepository: ResearchRepository, - private val labRepository: LabRepository, + private val labRepository: LabRepository ) : ResearchEventService { @EventListener @Transactional diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/research/service/ResearchService.kt b/src/main/kotlin/com/wafflestudio/csereal/core/research/service/ResearchService.kt index 7731dbd5..c98c87e9 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/research/service/ResearchService.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/research/service/ResearchService.kt @@ -48,7 +48,7 @@ interface ResearchService { class ResearchServiceImpl( private val researchRepository: ResearchRepository, private val researchLanguageRepository: ResearchLanguageRepository, - private val mainImageService: MainImageService, + private val mainImageService: MainImageService ) : ResearchService { @Transactional override fun createResearchLanguage(