Forth solution

Author: Wojtas1996PL

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

@@ -2,7 +2,7 @@
 
 import io.swagger.oas.annotations.Operation;
 import java.util.List;
-import mate.academy.rickandmorty.model.CharacterModel;
+import mate.academy.rickandmorty.dto.CharacterModelDto;
 import mate.academy.rickandmorty.service.RickAndMortyClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -18,13 +18,13 @@ public RickAndMortyController(RickAndMortyClient rickAndMortyClient) {
 
     @Operation(summary = "Get random character")
     @GetMapping
-    public CharacterModel getRandomCharacter() {
+    public CharacterModelDto getRandomCharacter() {
         return rickAndMortyClient.getRandomCharacter();
     }
 
     @Operation(summary = "Get list of characters matching parameter")
     @GetMapping("/character")
-    public List<CharacterModel> getCharactersList(@RequestParam String name) {
-        return rickAndMortyClient.getCharactersList(name);
+    public List<CharacterModelDto> getCharactersList(@RequestParam String nameSegment) {
+        return rickAndMortyClient.getCharactersListByNameSegment(nameSegment);
     }
 }

src/main/java/mate/academy/rickandmorty/mapper/CharacterModelMapper.java

@@ -3,13 +3,8 @@
 import mate.academy.rickandmorty.dto.CharacterModelDto;
 import mate.academy.rickandmorty.model.CharacterModel;
 
-public class CharacterModelMapper {
-    public static CharacterModel toCharacterModel(CharacterModelDto characterModelDto) {
-        CharacterModel characterModel = new CharacterModel();
-        characterModel.setExternalId(characterModelDto.id());
-        characterModel.setName(characterModelDto.name());
-        characterModel.setGender(characterModelDto.gender());
-        characterModel.setStatus(characterModelDto.status());
-        return characterModel;
-    }
+public interface CharacterModelMapper {
+    CharacterModelDto toDto(CharacterModel characterModel);
+
+    CharacterModel toModel(CharacterModelDto characterModelDto);
 }

src/main/java/mate/academy/rickandmorty/mapper/CharacterModelMapperImpl.java

@@ -0,0 +1,33 @@
+package mate.academy.rickandmorty.mapper;
+
+import mate.academy.rickandmorty.dto.CharacterModelDto;
+import mate.academy.rickandmorty.model.CharacterModel;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CharacterModelMapperImpl implements CharacterModelMapper {
+
+    @Override
+    public CharacterModelDto toDto(CharacterModel characterModel) {
+        if (characterModel == null) {
+            return null;
+        }
+        return new CharacterModelDto(characterModel.getExternalId(),
+                characterModel.getName(),
+                characterModel.getGender(),
+                characterModel.getStatus());
+    }
+
+    @Override
+    public CharacterModel toModel(CharacterModelDto characterModelDto) {
+        if (characterModelDto == null) {
+            return null;
+        }
+        CharacterModel characterModel = new CharacterModel();
+        characterModel.setExternalId(characterModelDto.id());
+        characterModel.setName(characterModelDto.name());
+        characterModel.setGender(characterModelDto.gender());
+        characterModel.setStatus(characterModelDto.status());
+        return characterModel;
+    }
+}

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

@@ -9,6 +9,7 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.List;
+import java.util.Map;
 import mate.academy.rickandmorty.dto.CharacterModelDto;
 import mate.academy.rickandmorty.mapper.CharacterModelMapper;
 import mate.academy.rickandmorty.model.CharacterModel;
@@ -22,25 +23,27 @@
 public class RickAndMortyClient {
     private static final String BASE_URL = "https://rickandmortyapi.com/api";
     private static final String CHARACTER = "/character";
-    private static final int MAX = 826;
     private static final int MIN = 1;
-    private static final int RANGE = MAX - MIN + 1;
     private final SessionFactory sessionFactory;
+    private final CharacterModelMapper characterModelMapper;
+    private int count;
 
-    public RickAndMortyClient(SessionFactory sessionFactory) {
+    public RickAndMortyClient(SessionFactory sessionFactory,
+                              CharacterModelMapper characterModelMapper) {
         this.sessionFactory = sessionFactory;
+        this.characterModelMapper = characterModelMapper;
     }
 
-    public CharacterModel getRandomCharacter() {
+    public CharacterModelDto getRandomCharacter() {
         Transaction transaction = null;
-        int random = (int) (Math.random() * RANGE) + MIN;
+        int random = (int) (Math.random() * count) + MIN;
         try (Session session = sessionFactory.openSession()) {
             transaction = session.beginTransaction();
             Query<CharacterModel> query = session.createQuery("FROM User u "
                     + "WHERE u.externalId = :random", CharacterModel.class);
             query.setParameter("externalId", random);
             transaction.commit();
-            return query.getSingleResult();
+            return characterModelMapper.toDto(query.getSingleResult());
         } catch (Exception e) {
             if (transaction != null) {
                 transaction.rollback();
@@ -49,15 +52,18 @@ public CharacterModel getRandomCharacter() {
         }
     }
 
-    public List<CharacterModel> getCharactersList(String name) {
+    public List<CharacterModelDto> getCharactersListByNameSegment(String nameSegment) {
         Transaction transaction = null;
         try (Session session = sessionFactory.openSession()) {
             transaction = session.beginTransaction();
             Query<CharacterModel> query = session.createQuery("FROM User u "
-                    + "WHERE u.name = :%name%", CharacterModel.class);
-            query.setParameter("%name%", name);
+                    + "WHERE u.name = :%nameSegment%", CharacterModel.class);
+            query.setParameter("%name%", nameSegment);
             transaction.commit();
-            return query.getResultList();
+            return query.getResultList()
+                    .stream()
+                    .map(characterModelMapper::toDto)
+                    .toList();
         } catch (Exception e) {
             if (transaction != null) {
                 transaction.rollback();
@@ -68,30 +74,47 @@ public List<CharacterModel> getCharactersList(String name) {
 
     @PostConstruct
     public List<CharacterModelDto> fetchAllCharacters() {
-        StringBuilder builder = new StringBuilder();
-        for (int i = MIN; i <= MAX; i++) {
-            builder.append(i);
-            if (i < MAX) {
-                builder.append(",");
-            }
-        }
         Transaction transaction = null;
         HttpClient httpClient = HttpClient.newHttpClient();
-        String url = BASE_URL + CHARACTER + "/" + builder;
+        String infoUrl = BASE_URL + CHARACTER;
         HttpRequest httpRequest = HttpRequest
                 .newBuilder()
                 .GET()
-                .uri(URI.create(url))
+                .uri(URI.create(infoUrl))
                 .build();
         try (Session session = sessionFactory.openSession()) {
             transaction = session.beginTransaction();
             HttpResponse<String> httpResponse = httpClient
                     .send(httpRequest, HttpResponse.BodyHandlers.ofString());
             ObjectMapper objectMapper = new ObjectMapper();
-            List<CharacterModelDto> characters = objectMapper
+            Map<String,Object> website = objectMapper
                     .readValue(httpResponse.body(), new TypeReference<>() {});
+            String[] info = website.get("info").toString().split(",");
+            for (String inf : info) {
+                if (inf.contains("count")) {
+                    count = Integer.parseInt(inf.substring(inf.indexOf("=") + 1));
+                }
+            }
+            StringBuilder builder = new StringBuilder();
+            for (int i = 1; i <= count; i++) {
+                builder.append(i);
+                if (i < count) {
+                    builder.append(",");
+                }
+            }
+            String url = BASE_URL + CHARACTER + "/" + builder;
+            HttpRequest httpRequest2 = HttpRequest
+                    .newBuilder()
+                    .GET()
+                    .uri(URI.create(url))
+                    .build();
+            HttpResponse<String> httpResponse2 = httpClient
+                    .send(httpRequest2, HttpResponse.BodyHandlers.ofString());
+            ObjectMapper objectMapper2 = new ObjectMapper();
+            List<CharacterModelDto> characters = objectMapper2
+                    .readValue(httpResponse2.body(), new TypeReference<>() {});
             for (CharacterModelDto character : characters) {
-                session.persist(CharacterModelMapper.toCharacterModel(character));
+                session.persist(characterModelMapper.toModel(character));
             }
             transaction.commit();
             return characters;