Skip to content

fix: professor language 추가 #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 27, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.wafflestudio.csereal.core.member.database

import com.wafflestudio.csereal.common.config.BaseTimeEntity
import com.wafflestudio.csereal.common.controller.MainImageContentEntityType
import com.wafflestudio.csereal.common.properties.LanguageType
import com.wafflestudio.csereal.core.member.dto.ProfessorDto
import com.wafflestudio.csereal.core.research.database.LabEntity
import com.wafflestudio.csereal.core.resource.mainImage.database.MainImageEntity
Expand All @@ -10,6 +11,8 @@ import java.time.LocalDate

@Entity(name = "professor")
class ProfessorEntity(
@Enumerated(EnumType.STRING)
var language: LanguageType,

var name: String,

Expand Down Expand Up @@ -49,8 +52,9 @@ class ProfessorEntity(
override fun bringMainImage(): MainImageEntity? = mainImage

companion object {
fun of(professorDto: ProfessorDto): ProfessorEntity {
fun of(languageType: LanguageType, professorDto: ProfessorDto): ProfessorEntity {
return ProfessorEntity(
language = languageType,
name = professorDto.name,
status = professorDto.status,
academicRank = professorDto.academicRank,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.wafflestudio.csereal.core.member.dto

import com.fasterxml.jackson.annotation.JsonInclude
import com.wafflestudio.csereal.common.properties.LanguageType
import com.wafflestudio.csereal.core.member.database.ProfessorEntity
import com.wafflestudio.csereal.core.member.database.ProfessorStatus
import java.time.LocalDate

data class ProfessorDto(
@JsonInclude(JsonInclude.Include.NON_NULL)
var id: Long? = null,
val language: String,
val name: String,
val status: ProfessorStatus,
val academicRank: String,
Expand All @@ -31,6 +33,7 @@ data class ProfessorDto(
fun of(professorEntity: ProfessorEntity, imageURL: String?): ProfessorDto {
return ProfessorDto(
id = professorEntity.id,
language = LanguageType.makeLowercase(professorEntity.language),
name = professorEntity.name,
status = professorEntity.status,
academicRank = professorEntity.academicRank,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.wafflestudio.csereal.core.member.service

import com.wafflestudio.csereal.common.CserealException
import com.wafflestudio.csereal.common.properties.LanguageType
import com.wafflestudio.csereal.core.member.database.*
import com.wafflestudio.csereal.core.member.dto.ProfessorDto
import com.wafflestudio.csereal.core.member.dto.ProfessorPageDto
Expand Down Expand Up @@ -40,7 +41,8 @@ class ProfessorServiceImpl(
private val applicationEventPublisher: ApplicationEventPublisher
) : ProfessorService {
override fun createProfessor(createProfessorRequest: ProfessorDto, mainImage: MultipartFile?): ProfessorDto {
val professor = ProfessorEntity.of(createProfessorRequest)
val enumLanguageType = LanguageType.makeStringToLanguageType(createProfessorRequest.language)
val professor = ProfessorEntity.of(enumLanguageType, createProfessorRequest)
if (createProfessorRequest.labId != null) {
val lab = labRepository.findByIdOrNull(createProfessorRequest.labId)
?: throw CserealException.Csereal404("해당 연구실을 찾을 수 없습니다. LabId: ${createProfessorRequest.labId}")
Expand Down Expand Up @@ -199,7 +201,8 @@ class ProfessorServiceImpl(
val list = mutableListOf<ProfessorDto>()

for (request in requestList) {
val professor = ProfessorEntity.of(request)
val enumLanguageType = LanguageType.makeStringToLanguageType(request.language)
val professor = ProfessorEntity.of(enumLanguageType, request)
if (request.labName != null) {
val lab = labRepository.findByName(request.labName)
?: throw CserealException.Csereal404("해당 연구실을 찾을 수 없습니다. LabName: ${request.labName}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class ProfessorServiceTest(
labEntity = labRepository.save(labEntity)

val professorDto = ProfessorDto(
language = "ko",
name = "name",
email = "email",
status = ProfessorStatus.ACTIVE,
Expand Down Expand Up @@ -162,6 +163,7 @@ class ProfessorServiceTest(

val createdProfessorDto = professorService.createProfessor(
ProfessorDto(
language = "ko",
name = "name",
email = "email",
status = ProfessorStatus.ACTIVE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class ResearchSearchServiceTest(
// Save professors
val professor1Dto = professorService.createProfessor(
createProfessorRequest = ProfessorDto(
language = "ko",
name = "professor1",
email = null,
status = ProfessorStatus.ACTIVE,
Expand All @@ -67,6 +68,7 @@ class ResearchSearchServiceTest(
)
val professor2Dto = professorService.createProfessor(
createProfessorRequest = ProfessorDto(
language = "ko",
name = "professor2",
email = null,
status = ProfessorStatus.ACTIVE,
Expand Down Expand Up @@ -160,6 +162,7 @@ class ResearchSearchServiceTest(
When("professor가 추가된다면") {
val process3CreatedDto = professorService.createProfessor(
createProfessorRequest = ProfessorDto(
language = "ko",
name = "newProfessor",
email = "email",
status = ProfessorStatus.ACTIVE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.wafflestudio.csereal.core.reseach.service

import com.wafflestudio.csereal.common.properties.LanguageType
import com.wafflestudio.csereal.core.member.database.ProfessorEntity
import com.wafflestudio.csereal.core.member.database.ProfessorRepository
import com.wafflestudio.csereal.core.member.database.ProfessorStatus
Expand Down Expand Up @@ -156,6 +157,7 @@ class ResearchServiceTest(
// Save professors
val professor1 = professorRepository.save(
ProfessorEntity(
language = LanguageType.KO,
name = "professor1",
status = ProfessorStatus.ACTIVE,
academicRank = "professor",
Expand All @@ -170,6 +172,7 @@ class ResearchServiceTest(
)
val professor2 = professorRepository.save(
ProfessorEntity(
language = LanguageType.KO,
name = "professor2",
status = ProfessorStatus.ACTIVE,
academicRank = "professor",
Expand Down Expand Up @@ -258,6 +261,7 @@ class ResearchServiceTest(
// Save professors
val professor1 = professorRepository.save(
ProfessorEntity(
language = LanguageType.KO,
name = "professor1",
status = ProfessorStatus.ACTIVE,
academicRank = "professor",
Expand All @@ -272,6 +276,7 @@ class ResearchServiceTest(
)
val professor2 = professorRepository.save(
ProfessorEntity(
language = LanguageType.KO,
name = "professor2",
status = ProfessorStatus.ACTIVE,
academicRank = "professor",
Expand Down Expand Up @@ -318,6 +323,7 @@ class ResearchServiceTest(
When("pdf를 제외하고 Lab을 수정한다면") {
val professor3 = professorRepository.save(
ProfessorEntity(
language = LanguageType.KO,
name = "professor3",
status = ProfessorStatus.ACTIVE,
academicRank = "professor",
Expand Down