fix bugs add validate

Author: Mardvey-UMA

WeatherCastApp/schema-loader/load-schemas.sh

@@ -4,25 +4,20 @@ set -euo pipefail
 SR_URL="${SCHEMA_REGISTRY_URL:-http://schema-registry:8081}"
 SCHEMA_DIR="${SCHEMA_DIR:-/schemas}"
 
-echo "---> Waiting until Schema Registry ($SR_URL) is up..."
 until curl -fsS "$SR_URL/subjects" >/dev/null 2>&1; do
   sleep 1
 done
-echo "---> Schema Registry reachable at $SR_URL"
-echo
 
 declare -A MAPPING=(
   ["WeatherResponseKafkaDTO"]="weather-subscribers"
 )
 
-echo "---> Registering local *.avsc → subject according to topic mapping"
 for file in "$SCHEMA_DIR"/*.avsc; do
   [ -e "$file" ] || { echo "No .avsc found in $SCHEMA_DIR"; exit 0; }
 
   base="$(basename "$file" .avsc)"
 
   if [[ -z "${MAPPING[$base]:-}" ]]; then
-    echo "  [WARN] No topic mapping for '$base' → skipping"
     continue
   fi
 
@@ -31,13 +26,10 @@ for file in "$SCHEMA_DIR"/*.avsc; do
 
   schema_str=$(jq -Rs . <"$file")
 
-  echo "  → Registering $file as subject '$subj'..."
   curl -sS -X POST \
        -H "Content-Type: application/vnd.schemaregistry.v1+json" \
        --data "{\"schema\":${schema_str}}" \
        "$SR_URL/subjects/$subj/versions" \
     && echo "    [ok] $subj registered" \
     || echo "    [error] failed to register $subj"
 done
-
-echo "All done."

WeatherCastApp/src/main/java/tb/wca/dto/SubscriptionRequestDTO.java

@@ -14,11 +14,17 @@ public record SubscriptionRequestDTO(
         @NotBlank(message = "City name must not be blank")
         String cityName,
 
-        @NotNull(message = "Notification time must not be null")
         LocalTime notificationTime,
 
         String timeZone
 ) {
+        @AssertTrue(message = "notificationTime must be in HH:mm format")
+        private boolean isNotificationTimeValid() {
+                if (notificationTime == null) return false;
+                return notificationTime.getSecond() == 0
+                        && notificationTime.getNano()   == 0;
+        }
+
         @AssertTrue(message = "timeZone must be provided and must be a valid ZoneId")
         private boolean isTimeZoneValid() {
                 if (timeZone == null || timeZone.isBlank()) {

WeatherCastApp/src/main/java/tb/wca/dto/SubscriptionResponseDTO.java

@@ -1,11 +1,29 @@
 package tb.wca.dto;
 
 import lombok.Builder;
-import lombok.Setter;
+import tb.wca.entity.SubscriptionEntity;
+import tb.wca.util.TimeCalculator;
 
 import java.time.Instant;
+import java.time.LocalDateTime;
 
 @Builder
 public record SubscriptionResponseDTO(
-        Instant expectedNextNotificationDateTime
-) { }
+        Instant expectedNextNotificationDateTime,
+        LocalDateTime expectedNextNotificationDateTimeFormatted,
+        String message
+) {
+    public static SubscriptionResponseDTO of(SubscriptionEntity subscription) {
+
+        Instant nextInstant = TimeCalculator.calculateNextNotification(subscription);
+        LocalDateTime nextLocal = TimeCalculator.instantToLocalDateTime(
+                nextInstant, subscription.getTimeZone()
+        );
+
+        return new SubscriptionResponseDTO(nextInstant, nextLocal, "Success subscribe");
+    }
+
+    public static SubscriptionResponseDTO message(String msg) {
+        return new SubscriptionResponseDTO(null, null, msg);
+    }
+}

WeatherCastApp/src/main/java/tb/wca/exceptions/GlobalExceptionHandler.java

@@ -55,6 +55,16 @@ public ResponseEntity<ExceptionResponse> handleNotFoundDataException(NotFoundDat
         return buildErrorResponse(ex.getErrorCode(), ex.getMessage());
     }
 
+    @ExceptionHandler(SubscriptionNotFoundException.class)
+    public ResponseEntity<ExceptionResponse> handleSubscriptionNotFoundException(SubscriptionNotFoundException ex) {
+        return buildErrorResponse(ex.getErrorCode(), ex.getMessage());
+    }
+
+    @ExceptionHandler(UserNotFoundException.class)
+    public ResponseEntity<ExceptionResponse> handleUserNotFoundException(UserNotFoundException ex) {
+        return buildErrorResponse(ex.getErrorCode(), ex.getMessage());
+    }
+
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public ResponseEntity<ExceptionResponse> handleMethodArgumentNotValid(MethodArgumentNotValidException ex) {
         String details = ex.getBindingResult()

WeatherCastApp/src/main/java/tb/wca/exceptions/SubscriptionNotFoundException.java

@@ -1,7 +1,13 @@
 package tb.wca.exceptions;
 
-public class SubscriptionNotFoundException extends RuntimeException {
-    public SubscriptionNotFoundException(Long teleramId) {
-        super("Subscription for user with teleramId = " + telegramId + " not found");
+import tb.wca.exceptions.enums.BusinessErrorCodes;
+
+public class SubscriptionNotFoundException extends BusinessException {
+    public SubscriptionNotFoundException(Long telegramId)
+        {
+            super(BusinessErrorCodes.SUBSCRIPTION_NOT_FOUND);
+        }
+    public SubscriptionNotFoundException(String additionalMessage) {
+        super(BusinessErrorCodes.SUBSCRIPTION_NOT_FOUND, additionalMessage);
     }
 }

WeatherCastApp/src/main/java/tb/wca/exceptions/UserNotFoundException.java

@@ -1,8 +1,13 @@
 package tb.wca.exceptions;
 
-public class UserNotFoundException extends RuntimeException {
+import tb.wca.exceptions.enums.BusinessErrorCodes;
+
+public class UserNotFoundException extends BusinessException {
     public UserNotFoundException(Long telegramId) {
-        super("User with telegramId=" + telegramId + " not found");
+        super(BusinessErrorCodes.USER_NOT_FOUND);
+    }
+    public UserNotFoundException(String additionalMessage) {
+        super(BusinessErrorCodes.NOT_FOUND_DATA, additionalMessage);
     }
 }
 

WeatherCastApp/src/main/java/tb/wca/exceptions/enums/BusinessErrorCodes.java

@@ -19,7 +19,9 @@ public enum BusinessErrorCodes {
     INVALID_ARGUMENTS(400, HttpStatus.BAD_REQUEST, "Invalid arguments"),
     CONSTRAINT_VIOLATION(400, HttpStatus.BAD_REQUEST, "Constraint violation"),
     DATA_INTEGRITY_VIOLATION(400, HttpStatus.BAD_REQUEST, "Data integrity violation"),
-    INVALID_FORMAT(400, HttpStatus.BAD_REQUEST, "Invalid JSON format");
+    INVALID_FORMAT(400, HttpStatus.BAD_REQUEST, "Invalid JSON format"),
+    USER_NOT_FOUND(403, HttpStatus.NOT_FOUND, "User not found"),
+    SUBSCRIPTION_NOT_FOUND(403, HttpStatus.NOT_FOUND, "Subscription not found");
 
     private final int code;
     private final HttpStatus httpStatus;