Merge pull request #122 from Team-NumberOne/fix/3_9

api 버그 수정

Author: nohy6630

src/main/kotlin/com/numberone/daepiro/domain/community/repository/article/ArticleRepository.kt

@@ -11,7 +11,7 @@ import org.springframework.data.repository.query.Param
 import java.time.LocalDateTime
 
 interface ArticleRepository : JpaRepository<Article, Long>, ArticleRepositoryCustom {
-    @Query("SELECT a FROM Article a WHERE a.type = 'DISASTER' AND a.createdAt>:time")
+    @Query("SELECT a FROM Article a WHERE a.type = 'DISASTER' AND a.createdAt>:time ORDER BY a.createdAt DESC")
     fun findDisasterSituation(@Param("time") time: LocalDateTime): List<Article>
 
     @Query("SELECT a FROM Article a WHERE a.type = 'SPONSOR' AND ( a.deadline > CURRENT_TIMESTAMP OR a.deadline IS NULL ) ORDER BY a.createdAt ASC")

src/main/kotlin/com/numberone/daepiro/domain/community/repository/article/ArticleRepositoryCustomImpl.kt

@@ -100,9 +100,9 @@ class ArticleRepositoryCustomImpl(
                 article.commentCount,
                 article.reportCount,
                 QAddressResponse(
-                    caseWhenLocationVisible(address.id, null),
-                    caseWhenLocationVisible(address.siDo, null),
-                    caseWhenLocationVisible(address.siGunGu, null),
+                    address.id,
+                    address.siDo,
+                    address.siGunGu,
                     caseWhenLocationVisible(address.eupMyeonDong, null),
                 ),
                 article.createdAt,

src/main/kotlin/com/numberone/daepiro/domain/community/service/ArticleService.kt

@@ -386,7 +386,7 @@ class ArticleService(
     }
 
     fun getAvailablePosition(request: GetAvailablePositionRequest): Boolean {
-        val addresses = addressRepository.findChildWithMe(
+        val addresses = addressRepository.findParentWithMe(
             address = geoLocationConverter.findByLongitudeAndLatitudeOrThrow(
                 request.longitude,
                 request.latitude,

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

@@ -52,7 +52,7 @@ data class DisasterSituationResponse(
                 content = article.body,
                 location = article.address!!.toFullAddress(),
                 time = article.createdAt,
-                commentCount = comments.size.toLong(),
+                commentCount = article.commentCount.toLong(),
                 isReceived = isReceived,
                 comments = comments.map { SituationCommentResponse.of(it.first, user, false,it.second, mapOf()) }
             )

src/main/kotlin/com/numberone/daepiro/domain/home/service/HomeService.kt

@@ -34,7 +34,7 @@ class HomeService(
     fun getHomeDisasters(userId: Long): ApiResult<List<HomeDisasterFeed>> {
         val user = userRepository.findByIdOrThrow(userId)
         val disasters = disasterService.getDisasterByAddressAndType(
-            user.userAddresses.map { it.address },
+            user.userAddresses.map { it.address } + user.address!!,
             user.userDisasterTypes.map { it.disasterType }
         )
 
@@ -52,7 +52,8 @@ class HomeService(
             user.userDisasterTypes.map { it.disasterType }
         )
         val sixHourBefore = LocalDateTime.now().minusHours(6)
-        val sortedDisasters = disasters.sortedByDescending { it.generatedAt }.filter { it.generatedAt.isAfter(sixHourBefore) }
+        val sortedDisasters =
+            disasters.sortedByDescending { it.generatedAt }.filter { it.generatedAt.isAfter(sixHourBefore) }
         val twentyFourHoursAgo = LocalDateTime.now().minusHours(24)
         val disaster = sortedDisasters.firstOrNull()
             ?: throw CustomException(NOT_FOUND_OCCURRED_DISASTER)

src/main/resources/application.yml

@@ -8,8 +8,8 @@ logging:
 spring:
   servlet:
     multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
+      max-file-size: 20MB
+      max-request-size: 20MB
   jpa:
     hibernate:
       # todo: 릴리즈 된 이후에 update -> none 으로 변경 필요