Merge pull request #118 from Team-NumberOne/fix/api5

api 버그 수정

Author: nohy6630

src/main/kotlin/com/numberone/daepiro/domain/disasterSituation/dto/response/DisasterSituationResponse.kt

@@ -13,6 +13,9 @@ data class DisasterSituationResponse(
     @Schema(description = "재난 종류", example = "호우")
     val type: String,
 
+    @Schema(description = "재난 종류 id", example = "호우")
+    val typeId: Long,
+
     @Schema(description = "제목", example = "서울특별시 성북구 쌍문동 호우 발생")
     val title: String,
 
@@ -43,6 +46,7 @@ data class DisasterSituationResponse(
         ): DisasterSituationResponse {
             return DisasterSituationResponse(
                 id = article.id!!,
+                typeId = article.disasterType!!.id!!,
                 type = article.disasterType!!.type.korean,
                 title = article.title,
                 content = article.body,

src/main/kotlin/com/numberone/daepiro/domain/user/entity/UserEntity.kt

@@ -87,10 +87,13 @@ class UserEntity(
     ) {
         this.realname = realname
         this.nickname = nickname
-        this.profileImageUrl = "https://daepiro-dev.s3.ap-northeast-2.amazonaws.com/article/profile/" + (Random.nextInt(
-            1,
-            8
-        )) + ".png"
+        if (this.profileImageUrl == null) {
+            this.profileImageUrl =
+                "https://daepiro-dev.s3.ap-northeast-2.amazonaws.com/article/profile/" + (Random.nextInt(
+                    1,
+                    8
+                )) + ".png"
+        }
     }
 
     fun initFcmToken(fcmToken: String?) {