fixes 3

Author: Lyten1

src/main/java/mate/academy/rickandmorty/controller/CharacterController.java

@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.persistence.EntityNotFoundException;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import mate.academy.rickandmorty.dto.internal.CharacterDto;
@@ -30,7 +31,8 @@ public class CharacterController {
             }
     )
     public CharacterDto getRandom() {
-        return characterService.getRandomCharacter();
+        return characterService.getRandomCharacter().orElseThrow(() ->
+                new EntityNotFoundException("Character not found cause database is empty"));
     }
 
     @GetMapping()

src/main/java/mate/academy/rickandmorty/dto/external/ResponseCharacterDto.java

@@ -1,6 +1,6 @@
 package mate.academy.rickandmorty.dto.external;
 
-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.util.List;
 import lombok.Data;
 
@@ -18,6 +18,6 @@ public class ResponseCharacterDto {
     private String image;
     private List<String> episode;
     private String url;
-    private LocalDateTime created;
+    private OffsetDateTime created;
 
 }

src/main/java/mate/academy/rickandmorty/model/Character.java

@@ -10,7 +10,7 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.util.List;
 import lombok.Data;
 
@@ -48,7 +48,7 @@ public class Character {
     )
     private List<Episode> episodes;
     private String url;
-    private LocalDateTime created;
+    private OffsetDateTime created;
 
 
 }

src/main/java/mate/academy/rickandmorty/model/Location.java

@@ -4,8 +4,10 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import lombok.Data;
 
 @Entity
+@Data
 public class Location {
 
     @Id

src/main/java/mate/academy/rickandmorty/service/CharacterService.java

@@ -8,6 +8,7 @@
 import java.net.http.HttpResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Random;
 import lombok.RequiredArgsConstructor;
 import mate.academy.rickandmorty.dto.external.ResponseDataDto;
@@ -21,9 +22,8 @@
 @RequiredArgsConstructor
 public class CharacterService {
 
-    private static final String DEFAULT_API = "https://rickandmortyapi.com/api/";
-    private static final String CHARACTER = "character";
-    private static int countOfCharacters = 0;
+    private static final String API = "https://rickandmortyapi.com/api/character";
+
     private final ObjectMapper objectMapper;
     private final CharacterMapper characterMapper;
     private final CharacterRepository characterRepository;
@@ -33,7 +33,7 @@ public void loadAllCharacters() {
             return;
         }
         HttpClient httpClient = HttpClient.newHttpClient();
-        String url = DEFAULT_API + CHARACTER;
+        String url = API;
 
         HttpRequest httpRequest = HttpRequest.newBuilder()
                 .GET()
@@ -59,9 +59,8 @@ public void loadAllCharacters() {
                         .toList());
             }
             characterRepository.saveAll(characterList);
-            countOfCharacters = responseDataDto.info().count();
         } catch (IOException | InterruptedException e) {
-            throw new RuntimeException(e);
+            throw new RuntimeException("Fetching data failed", e);
         }
         System.out.println("Loading finished successfully");
     }
@@ -72,12 +71,14 @@ public List<CharacterDto> getByName(String name) {
                 .toList();
     }
 
-    public CharacterDto getRandomCharacter() {
+    public Optional<CharacterDto> getRandomCharacter() {
         List<Long> allIds = characterRepository.findAllIds();
-        int random = new Random().nextInt(0, allIds.size());
+        if (allIds.isEmpty()) {
+            return Optional.empty();
+        }
+        int random = new Random().nextInt(allIds.size());
         return characterRepository.findById(allIds.get(random))
-                .map(characterMapper::toDto)
-                .orElse(null);
+                .map(characterMapper::toDto);
     }
 
 }