Merge pull request #30

language + information

grow-api/src/main/kotlin/com/molohala/grow/api/info/InfoController.kt

@@ -2,6 +2,7 @@ package com.molohala.grow.api.info
 
 import com.molohala.grow.api.response.Response
 import com.molohala.grow.api.response.ResponseData
+import com.molohala.grow.core.info.application.dto.req.EditUserInfoReq
 import com.molohala.grow.core.info.application.dto.req.NewSocialAccountReq
 import com.molohala.grow.core.info.application.service.InfoService
 import jakarta.validation.Valid
@@ -23,6 +24,12 @@ class InfoController(
     @GetMapping("/me")
     fun getMyUserInfo() = ResponseData.ok("내 정보 조회 완료", infoService.getMyInfo())
 
+    @PatchMapping("/me")
+    fun editMyInfo(@RequestBody data: EditUserInfoReq): Response {
+        infoService.editInfo(data.bio, data.job)
+        return Response.ok("내 정보 수정 완료")
+    }
+
     @GetMapping("/user/{id}")
     fun getOtherUserInfo(@PathVariable id: Long) = ResponseData.ok("유저 정보 조회 완료", infoService.getUserInfo(id))
 

grow-api/src/main/kotlin/com/molohala/grow/api/language/LanguageController.kt

@@ -0,0 +1,25 @@
+package com.molohala.grow.api.language
+
+import com.molohala.grow.api.response.Response
+import com.molohala.grow.api.response.ResponseData
+import com.molohala.grow.core.language.application.dto.req.EditLanguageReq
+import com.molohala.grow.core.language.application.service.LanguageService
+import org.springframework.web.bind.annotation.*
+
+@RestController
+@RequestMapping("/language")
+class LanguageController(
+    private val languageService: LanguageService
+) {
+    @GetMapping
+    fun getAll() = ResponseData.ok("언어 리스트 조회 완료", languageService.getAvailableLanguage())
+
+    @GetMapping("/me")
+    fun languages() = ResponseData.ok("사용하는 언어 조회 완료", languageService.getUsingLanguages())
+
+    @PatchMapping("/me")
+    fun editLanguage(@RequestBody data: EditLanguageReq): Response {
+        languageService.updateUsingLanguages(data.langs)
+        return Response.ok("사용하는 언어 갱신 완료")
+    }
+}

grow-common/src/main/kotlin/com/molohala/grow/common/exception/GlobalExceptionCode.kt

@@ -12,6 +12,8 @@ enum class GlobalExceptionCode(
     METHOD_NOT_SUPPORTED(HttpStatus.BAD_REQUEST, "잘못된 메서드"),
     MEDIA_TYPE_NOT_SUPPORTED(HttpStatus.BAD_REQUEST, "잘못된 미디어 타입"),
     MEDIA_TYPE_MISS_MATCHED(HttpStatus.BAD_REQUEST, "잘못된 미디어 값"),
+    NO_BODY(HttpStatus.BAD_REQUEST, "요청 바디가 없음"),
+    INVALID_BODY(HttpStatus.BAD_REQUEST, "잘못된 요청 바디"),
     PARAMETER_NOT_FOUND(HttpStatus.BAD_REQUEST, "잘못된 파라미터"),
     INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "잘못된 파라미터"),
     INVALID_PERMISSION(HttpStatus.BAD_REQUEST, "유효하지 않은 권한"),

grow-common/src/main/kotlin/com/molohala/grow/common/exception/handler/CustomExceptionHandler.kt

@@ -4,6 +4,7 @@ import com.molohala.grow.common.exception.ErrorResponseEntity
 import com.molohala.grow.common.exception.GlobalExceptionCode
 import com.molohala.grow.common.exception.custom.CustomException
 import org.springframework.http.ResponseEntity
+import org.springframework.http.converter.HttpMessageNotReadableException
 import org.springframework.validation.FieldError
 import org.springframework.web.HttpMediaTypeNotSupportedException
 import org.springframework.web.HttpRequestMethodNotSupportedException
@@ -21,6 +22,13 @@ class CustomExceptionHandler {
         return ErrorResponseEntity.responseEntity(e.exceptionCode)
     }
 
+    @ExceptionHandler(HttpMessageNotReadableException::class)
+    protected fun handleHttpMessageNotReadableException(e: HttpMessageNotReadableException): ResponseEntity<ErrorResponseEntity> {
+        return ErrorResponseEntity.responseEntity(
+            if (e.cause == null) GlobalExceptionCode.NO_BODY else GlobalExceptionCode.INVALID_BODY
+        )
+    }
+
     @ExceptionHandler(MethodArgumentNotValidException::class)
     protected fun handleValidException(e: MethodArgumentNotValidException): ResponseEntity<ErrorResponseEntity> {
         val message = StringBuilder()

grow-core/src/main/kotlin/com/molohala/grow/core/auth/application/service/AuthServiceImpl.kt

@@ -33,7 +33,7 @@ class AuthServiceImpl(
                 if (member == null) {
                     member = save(userData)
                 } else {
-                    member.update(userData.email)
+                    member.updateEmail(userData.email)
                 }
                 issueJwtToken.issueToken(member.email, member.role)
             }

grow-core/src/main/kotlin/com/molohala/grow/core/info/application/dto/req/EditUserInfoReq.kt

@@ -0,0 +1,6 @@
+package com.molohala.grow.core.info.application.dto.req
+
+data class EditUserInfoReq(
+    val bio: String?,
+    val job: String?
+)

grow-core/src/main/kotlin/com/molohala/grow/core/info/application/dto/res/InfoRes.kt

@@ -6,6 +6,8 @@ data class InfoRes(
     val id: Long,
     val email: String,
     val name: String,
+    val bio: String,
+    val job: String,
     val createdAt: LocalDateTime,
     val socialAccounts: List<SocialAccountRes>,
 )

grow-core/src/main/kotlin/com/molohala/grow/core/info/application/service/InfoService.kt

@@ -11,4 +11,5 @@ interface InfoService {
     fun getUserInfo(userId: Long): InfoRes
     fun submitGithubId(name: String)
     fun submitSolvedAcInfo(name: String)
+    fun editInfo(bio: String?, job: String?)
 }

grow-core/src/main/kotlin/com/molohala/grow/core/info/application/service/InfoServiceImpl.kt

@@ -10,6 +10,7 @@ import com.molohala.grow.core.info.application.dto.res.SocialAccountRes
 import com.molohala.grow.core.info.application.dto.res.SolvedAcInfoRes
 import com.molohala.grow.core.info.exception.InfoExceptionCode
 import com.molohala.grow.core.member.application.MemberSessionHolder
+import com.molohala.grow.core.member.domain.consts.MemberJob
 import com.molohala.grow.core.member.domain.consts.SocialType
 import com.molohala.grow.core.member.domain.entity.SocialAccount
 import com.molohala.grow.core.member.repository.MemberJpaRepository
@@ -67,6 +68,8 @@ class InfoServiceImpl(
             member.id,
             member.email,
             member.name,
+            member.bio,
+            member.job.display,
             member.createdAt,
             socials
         )
@@ -86,6 +89,8 @@ class InfoServiceImpl(
             member.id,
             member.email,
             member.name,
+            member.bio,
+            member.job.display,
             member.createdAt,
             socials
         )
@@ -126,4 +131,11 @@ class InfoServiceImpl(
 
         socialAccountJpaRepository.save(SocialAccount(name, SocialType.SOLVED_AC, member.id))
     }
+
+    @Transactional(rollbackOn = [Exception::class])
+    override fun editInfo(bio: String?, job: String?) {
+        memberJpaRepository.save(
+            memberSessionHolder.current().apply { updateInfo(bio ?: this.bio, MemberJob.parse(job) ?: this.job) }
+        )
+    }
 }

grow-core/src/main/kotlin/com/molohala/grow/core/language/application/dto/req/EditLanguageReq.kt

@@ -0,0 +1,7 @@
+package com.molohala.grow.core.language.application.dto.req
+
+import com.fasterxml.jackson.annotation.JsonCreator
+
+data class EditLanguageReq @JsonCreator constructor(
+    val langs: List<Long>
+)

grow-core/src/main/kotlin/com/molohala/grow/core/language/application/runner/LanguageLoader.kt

@@ -0,0 +1,43 @@
+package com.molohala.grow.core.language.application.runner
+
+import com.molohala.grow.core.language.domain.entity.Language
+import com.molohala.grow.core.language.repository.LanguageJpaRepository
+import org.springframework.boot.ApplicationArguments
+import org.springframework.boot.ApplicationRunner
+import org.springframework.stereotype.Component
+
+@Component
+class LanguageLoader(
+    private val languageJpaRepository: LanguageJpaRepository
+) : ApplicationRunner {
+    override fun run(args: ApplicationArguments?) {
+        val languages = languageJpaRepository.findAll()
+        val m = listOf(
+            "Python",
+            "HTML",
+            "CSS",
+            "JavaScript",
+            "TypeScript",
+            "C",
+            "C++",
+            "C#",
+            "Kotlin",
+            "Java",
+            "Swift",
+            "Dart",
+            "Go",
+            "Ruby",
+            "Rust",
+            "SQL",
+            "PHP",
+            "Scala",
+            "Lua",
+        )
+        val addLang = ArrayList<Language>()
+
+        for (s in m) if (languages.none { it.name.lowercase() == s.lowercase() }) addLang.add(Language(s))
+
+        languageJpaRepository.saveAll(addLang)
+    }
+
+}

grow-core/src/main/kotlin/com/molohala/grow/core/language/application/service/LanguageService.kt

@@ -0,0 +1,9 @@
+package com.molohala.grow.core.language.application.service
+
+import com.molohala.grow.core.language.domain.entity.Language
+
+interface LanguageService {
+    fun updateUsingLanguages(langs: List<Long>)
+    fun getUsingLanguages(): List<Language>
+    fun getAvailableLanguage(): List<Language>
+}

grow-core/src/main/kotlin/com/molohala/grow/core/language/application/service/LanguageServiceImpl.kt

@@ -0,0 +1,52 @@
+package com.molohala.grow.core.language.application.service
+
+import com.molohala.grow.common.exception.custom.CustomException
+import com.molohala.grow.core.language.domain.entity.Language
+import com.molohala.grow.core.language.domain.entity.MemberAndLanguage
+import com.molohala.grow.core.language.exception.LanguageExceptionCode
+import com.molohala.grow.core.language.repository.LanguageJpaRepository
+import com.molohala.grow.core.language.repository.MemberLanguageJpaRepository
+import com.molohala.grow.core.language.repository.MemberLanguageQueryRepository
+import com.molohala.grow.core.member.application.MemberSessionHolder
+import jakarta.transaction.Transactional
+import org.springframework.stereotype.Service
+
+@Service
+class LanguageServiceImpl(
+    private val memberSessionHolder: MemberSessionHolder,
+    private val languageJpaRepository: LanguageJpaRepository,
+    private val memberLanguageJpaRepository: MemberLanguageJpaRepository,
+    private val memberLanguageQueryRepository: MemberLanguageQueryRepository
+) : LanguageService {
+    @Transactional(rollbackOn = [Exception::class])
+    override fun updateUsingLanguages(langs: List<Long>) {
+        val member = memberSessionHolder.current()
+        val dbLang = languageJpaRepository.findAll()
+
+        val owning =
+            memberLanguageJpaRepository
+                .findAllByMemberIdIs(member.id!!)
+
+        memberLanguageJpaRepository.deleteAllInBatch(owning.filter { it.languageId !in langs })
+
+        val toAdd = ArrayList<Language>()
+
+        for (lang in langs) {
+            val ent = dbLang.find { it.id == lang }
+            if (ent == null)
+                throw CustomException(LanguageExceptionCode.LANGUAGE_NOT_FOUND)
+            if (owning.none { it.languageId == lang }) toAdd.add(ent) // not owning
+        }
+
+        memberLanguageJpaRepository.saveAllAndFlush(
+            toAdd.map { MemberAndLanguage(member.id, it.id!!) }
+        )
+    }
+
+    override fun getUsingLanguages(): List<Language> {
+        val member = memberSessionHolder.current()
+        return memberLanguageQueryRepository.getLanguagesByMemberId(member.id!!)
+    }
+
+    override fun getAvailableLanguage(): List<Language> = languageJpaRepository.findAll()
+}

grow-core/src/main/kotlin/com/molohala/grow/core/language/domain/entity/Language.kt

@@ -0,0 +1,12 @@
+package com.molohala.grow.core.language.domain.entity
+
+import jakarta.persistence.*
+
+@Entity(name = "tbl_langs")
+data class Language(
+    val name: String,
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(updatable = false, nullable = false, name = "id")
+    val id: Long? = null
+)

grow-core/src/main/kotlin/com/molohala/grow/core/language/domain/entity/MemberAndLanguage.kt

@@ -0,0 +1,22 @@
+package com.molohala.grow.core.language.domain.entity
+
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+
+@Entity(name = "tbl_many_member_language")
+class MemberAndLanguage(
+    val memberId: Long,
+    val languageId: Long,
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(
+        name = "id",
+        nullable = false,
+        updatable = false
+    )
+    val id: Long? = null,
+)

grow-core/src/main/kotlin/com/molohala/grow/core/language/exception/LanguageExceptionCode.kt

@@ -0,0 +1,13 @@
+package com.molohala.grow.core.language.exception
+
+import com.molohala.grow.common.exception.ExceptionCode
+import org.springframework.http.HttpStatus
+
+enum class LanguageExceptionCode(private val status: HttpStatus, private val message: String) : ExceptionCode {
+    LANGUAGE_NOT_FOUND(HttpStatus.BAD_REQUEST, "해당하는 언어를 찾을 수 없음"),
+    ;
+
+    override fun getHttpStatus() = status
+    override fun getExceptionName() = name
+    override fun getMessage() = message
+}

grow-core/src/main/kotlin/com/molohala/grow/core/language/repository/LanguageJpaRepository.kt

@@ -0,0 +1,6 @@
+package com.molohala.grow.core.language.repository
+
+import com.molohala.grow.core.language.domain.entity.Language
+import org.springframework.data.jpa.repository.JpaRepository
+
+interface LanguageJpaRepository : JpaRepository<Language, Long>

grow-core/src/main/kotlin/com/molohala/grow/core/language/repository/MemberLanguageJpaRepository.kt

@@ -0,0 +1,8 @@
+package com.molohala.grow.core.language.repository
+
+import com.molohala.grow.core.language.domain.entity.MemberAndLanguage
+import org.springframework.data.jpa.repository.JpaRepository
+
+interface MemberLanguageJpaRepository : JpaRepository<MemberAndLanguage, Long> {
+    fun findAllByMemberIdIs(memberId: Long): List<MemberAndLanguage>
+}

grow-core/src/main/kotlin/com/molohala/grow/core/language/repository/MemberLanguageQueryDslRepository.kt

@@ -0,0 +1,29 @@
+package com.molohala.grow.core.language.repository
+
+import com.molohala.grow.core.language.domain.entity.Language
+import com.molohala.grow.core.language.domain.entity.QLanguage.language
+import com.molohala.grow.core.language.domain.entity.QMemberAndLanguage.memberAndLanguage
+import com.querydsl.core.types.Projections
+import com.querydsl.jpa.impl.JPAQueryFactory
+import org.springframework.stereotype.Repository
+
+@Repository
+class MemberLanguageQueryDslRepository(
+    private val queryFactory: JPAQueryFactory
+) : MemberLanguageQueryRepository {
+    override fun getLanguagesByMemberId(memberId: Long): List<Language> {
+        return queryFactory
+            .select(
+                Projections.constructor(
+                    Language::class.java,
+                    language.name,
+                    language.id
+                )
+            )
+            .from(memberAndLanguage)
+            .where(memberAndLanguage.memberId.eq(memberId))
+            .innerJoin(language)
+            .on(memberAndLanguage.languageId.eq(language.id))
+            .fetch()
+    }
+}

grow-core/src/main/kotlin/com/molohala/grow/core/language/repository/MemberLanguageQueryRepository.kt

@@ -0,0 +1,7 @@
+package com.molohala.grow.core.language.repository
+
+import com.molohala.grow.core.language.domain.entity.Language
+
+interface MemberLanguageQueryRepository {
+    fun getLanguagesByMemberId(memberId: Long): List<Language>
+}