release: dev → main 배포 (날씨 폴백·작물검증·음성지침 외)

backend/application/src/main/kotlin/com/chamchamcham/application/coaching/recordfeedback/generation/RecordFeedbackContextAssembler.kt

@@ -12,10 +12,12 @@ import com.chamchamcham.domain.farming.PlantingRecordRepository
 import com.chamchamcham.domain.farming.WateringRecordRepository
 import com.chamchamcham.domain.farming.WeedingRecordRepository
 import com.chamchamcham.domain.farming.WorkType
+import com.chamchamcham.application.weather.WeatherFallback
 import org.springframework.stereotype.Component
 import org.springframework.transaction.annotation.Transactional
 import java.time.Clock
 import java.time.LocalDate
+import java.time.LocalDateTime
 import java.util.UUID
 
 @Component
@@ -154,19 +156,35 @@ class RecordFeedbackContextAssembler(
             weatherPort.fetch(latitude, longitude, WEATHER_LIMIT_DAYS) to emptyList()
         } catch (exception: BusinessException) {
             when (exception.errorCode) {
+                // 좌표 문제는 외부 API 장애가 아니라 데이터 부재라 폴백 대상이 아니다(null 유지).
                 ErrorCode.WEATHER_LOCATION_REQUIRED -> null to listOf(WEATHER_LOCATION_UNAVAILABLE)
-                ErrorCode.WEATHER_PROVIDER_UNAVAILABLE -> null to listOf(WEATHER_PROVIDER_UNAVAILABLE)
+                // 외부 provider 장애는 서비스가 멈추지 않도록 폴백 날씨를 제공한다. degraded 사유는 남긴다.
+                ErrorCode.WEATHER_PROVIDER_UNAVAILABLE -> fallbackWeather() to listOf(WEATHER_PROVIDER_UNAVAILABLE)
                 else -> throw exception
             }
         } catch (_: RuntimeException) {
-            null to listOf(WEATHER_PROVIDER_UNAVAILABLE)
+            fallbackWeather() to listOf(WEATHER_PROVIDER_UNAVAILABLE)
         }
     }
 
+    // 외부 날씨 API 장애 시의 고정 폴백 라이브 날씨. 가짜 데이터에 위험경보를 붙이지 않으려고
+    // forecastDays는 비우고 riskFlags도 없다. source로 폴백임을 추적 가능하게 한다.
+    private fun fallbackWeather(): RecordFeedbackLiveWeather =
+        RecordFeedbackLiveWeather(
+            current = RecordFeedbackCurrentWeather(
+                temperatureC = WeatherFallback.TEMPERATURE,
+                skyCondition = WeatherFallback.CONDITION.text,
+                observedAt = LocalDateTime.now(clock),
+            ),
+            forecastDays = emptyList(),
+            source = FALLBACK_SOURCE,
+        )
+
     private companion object {
         const val WEATHER_LIMIT_DAYS = 7
         const val WEATHER_LOCATION_UNAVAILABLE = "weather_location_unavailable"
         const val WEATHER_PROVIDER_UNAVAILABLE = "weather_provider_unavailable"
         const val WEATHER_SKIPPED_FOR_HISTORICAL_RECORD = "weather_skipped_for_historical_record"
+        const val FALLBACK_SOURCE = "FALLBACK"
     }
 }

backend/application/src/main/kotlin/com/chamchamcham/application/exception/ErrorCode.kt

@@ -36,6 +36,7 @@ enum class ErrorCode(
     FARMING_RECORD_DETAIL_REQUIRED("FARMING_002", "error.farming_record_detail_required", 400),
     FARMING_RECORD_INVALID_DETAIL("FARMING_003", "error.farming_record_invalid_detail", 400),
     FARMING_RECORD_FORBIDDEN("FARMING_004", "error.farming_record_forbidden", 403),
+    FARMING_RECORD_CROP_NOT_IN_FARM("FARMING_006", "error.farming_record_crop_not_in_farm", 400),
     WEATHER_LOCATION_REQUIRED("WEATHER_001", "error.weather_location_required", 400),
     WEATHER_PROVIDER_UNAVAILABLE("WEATHER_002", "error.weather_provider_unavailable", 503),
     WEATHER_DATE_IN_FUTURE("WEATHER_003", "error.weather_date_in_future", 400),

backend/application/src/main/kotlin/com/chamchamcham/application/farming/FarmingRecordService.kt

@@ -9,6 +9,7 @@ import com.chamchamcham.application.report.ReportScope
 import com.chamchamcham.domain.crop.Crop
 import com.chamchamcham.domain.crop.CropRepository
 import com.chamchamcham.domain.crop.CropUsePartCategory
+import com.chamchamcham.domain.crop.MemberCropRepository
 import com.chamchamcham.domain.farm.Farm
 import com.chamchamcham.domain.farm.FarmRepository
 import com.chamchamcham.domain.farming.FarmingRecord
@@ -49,6 +50,7 @@ class FarmingRecordService(
     private val memberRepository: MemberRepository,
     private val farmRepository: FarmRepository,
     private val cropRepository: CropRepository,
+    private val memberCropRepository: MemberCropRepository,
     private val farmingRecordRepository: FarmingRecordRepository,
     private val farmingRecordMediaRepository: FarmingRecordMediaRepository,
     private val farmingRecordQueryRepository: FarmingRecordQueryRepository,
@@ -72,6 +74,7 @@ class FarmingRecordService(
         val member = findMember(command.memberId)
         val farm = findFarm(command.farmId, command.memberId)
         val crop = findCrop(command.cropId)
+        assertCropRegisteredToFarm(command.memberId, command.farmId, command.cropId)
         val media = validateMedia(command.memberId, command.mediaIds)
 
         val record = farmingRecordRepository.save(
@@ -162,6 +165,7 @@ class FarmingRecordService(
 
         val farm = findFarm(command.farmId, command.memberId)
         val crop = findCrop(command.cropId)
+        assertCropRegisteredToFarm(command.memberId, command.farmId, command.cropId)
         val existingRecordMedia = farmingRecordMediaRepository.findByRecord_Id(command.recordId)
         val media = validateUpdatedMedia(record, command.memberId, command.mediaIds)
 
@@ -575,6 +579,14 @@ class FarmingRecordService(
             BusinessException(ErrorCode.CROP_NOT_FOUND)
         }
 
+    // 회원이 해당 농장에 등록한(MemberCrop) 작물만 기록에 쓸 수 있다.
+    // farm 소유는 findFarm에서, 전역 작물 존재는 findCrop에서 확인하고, 여기서 (농장,작물) 등록 조합을 확인한다.
+    private fun assertCropRegisteredToFarm(memberId: UUID, farmId: UUID, cropId: UUID) {
+        if (!memberCropRepository.existsByMemberIdAndFarmIdAndCropId(memberId, farmId, cropId)) {
+            throw BusinessException(ErrorCode.FARMING_RECORD_CROP_NOT_IN_FARM)
+        }
+    }
+
     private fun findPesticide(pesticideId: UUID): Pesticide =
         pesticideRepository.findById(pesticideId).orElseThrow {
             BusinessException(ErrorCode.PESTICIDE_NOT_FOUND)