Dev (#58)

YuliiaNisha · Bondaliname · web-flow · commit d3a88df9d8fd · 2026-01-22T21:56:10.000+02:00
* configured actuator (#8) * Improve filtering (#9) * implemented search games method * refactored getById to use apiId * ran mvnclean package * Add user registration login (#11) * implemented registration and login * renamed username field, corrected structure of files * implemented user auth * fetched description * Merge pull request #13 from mategames-team/add-game-lists-to-user Add game lists to user * Improve fetch best games (#14) * changed get url * added already existing game check * fetch best games, update existing * changed sending configuration, added loggin * added logging to errors * created user info update and get (#15) * Refactor get by api id method (#16) * made method check if in db and if description is null * made method check if in db and if description is null * ran mvn cl package * Create get all games from api endpoint (#17) * created getAll method * made method retun page * created get all method * Configure comments (#18) * added create comment endpoint * created create, get, delete endpoints * configured comments * refactored comments (#19) * refactored comments * refactored comments * added status to response (#20) * created search in api endpoint (#21) * Create get user comments (#22) * created get user comments endpoint * updated readme * Update Dockerfile for dev environment * added swagger (#23) * added swagger * added link to swagger to readme * configured swagger * configured exceptions * refactored security and health (#24) * Refactor db update (#25) * made scheduled update * made scheduled and admin update * allowed any authenticated user se userinfo (#26) * allowed any authenticated user se userinfo * refactored readme * ran mvn clean package * configured setting user role during registration (#27) * created service tests (#28) * created service tests * removed unused import * made method return gameDto (#29) * configured cors (#30) * added preconditions to yamls (#31) * added patch method to cors (#32) * added response code (#33) * retun user info depending on param, return user id when login (#34) * updated readme, removed unused (#35) * added info about userGames and changed max value of rating to 10 (#37) * added ci file (#39) * added ci file * run mvn clean package * added profileName and gameName to commentDto (#40) * webhook after ci (#44) * Update public endpoints (#46) * made getUserInfo public * made getUserComments public * made getByStatus userGame public * ran mvn clean package * refactored delete method (#48) * made filtering games by several years (#49) * allowed rating to be up to 10 (#51) * added regex to validate (#53) * Add developer info to game (#55) * created developer entiry, configured liquibase * added logic to get developers info if missing * refactored mapping * added developer info * removed email from update method (#56) * return token after registartion (#57) --------- Co-authored-by: Alina Bondarenko <alinamoskovchuk18@gmail.com>
diff --git a/src/main/java/com/videogamescatalogue/backend/controller/AuthenticationController.java b/src/main/java/com/videogamescatalogue/backend/controller/AuthenticationController.java
@@ -3,6 +3,7 @@
 import com.videogamescatalogue.backend.dto.internal.user.UserLoginRequestDto;
 import com.videogamescatalogue.backend.dto.internal.user.UserLoginResponseDto;
 import com.videogamescatalogue.backend.dto.internal.user.UserRegistrationRequestDto;
+import com.videogamescatalogue.backend.dto.internal.user.UserRegistrationResponseDto;
 import com.videogamescatalogue.backend.dto.internal.user.UserResponseDto;
 import com.videogamescatalogue.backend.security.AuthenticationService;
 import com.videogamescatalogue.backend.service.user.UserService;
@@ -45,7 +46,7 @@ public class AuthenticationController {
             }
     )
     @PostMapping("/registration")
-    UserResponseDto registerUser(
+    UserRegistrationResponseDto registerUser(
             @RequestBody @Valid UserRegistrationRequestDto requestDto
     ) {
         return userService.registerUser(requestDto);
diff --git a/src/main/java/com/videogamescatalogue/backend/dto/external/ApiResponseDeveloperDto.java b/src/main/java/com/videogamescatalogue/backend/dto/external/ApiResponseDeveloperDto.java
@@ -0,0 +1,7 @@
+package com.videogamescatalogue.backend.dto.external;
+
+public record ApiResponseDeveloperDto(
+        Long id,
+        String name
+) {
+}
diff --git a/src/main/java/com/videogamescatalogue/backend/dto/external/ApiResponseFullGameDto.java b/src/main/java/com/videogamescatalogue/backend/dto/external/ApiResponseFullGameDto.java
@@ -15,6 +15,8 @@ public record ApiResponseFullGameDto(
 
         List<ApiResponseGenreDto> genres,
 
+        List<ApiResponseDeveloperDto> developers,
+
         BigDecimal rating
 ) {
 }
diff --git a/src/main/java/com/videogamescatalogue/backend/dto/internal/developer/DeveloperDto.java b/src/main/java/com/videogamescatalogue/backend/dto/internal/developer/DeveloperDto.java
@@ -0,0 +1,8 @@
+package com.videogamescatalogue.backend.dto.internal.developer;
+
+public record DeveloperDto(
+        Long id,
+        Long apiId,
+        String name
+) {
+}
diff --git a/src/main/java/com/videogamescatalogue/backend/dto/internal/game/GameDto.java b/src/main/java/com/videogamescatalogue/backend/dto/internal/game/GameDto.java
@@ -1,5 +1,6 @@
 package com.videogamescatalogue.backend.dto.internal.game;
 
+import com.videogamescatalogue.backend.dto.internal.developer.DeveloperDto;
 import com.videogamescatalogue.backend.dto.internal.genre.GenreDto;
 import com.videogamescatalogue.backend.dto.internal.platform.PlatformDto;
 import java.math.BigDecimal;
@@ -12,6 +13,7 @@ public record GameDto(
         String backgroundImage,
         Set<PlatformDto> platforms,
         Set<GenreDto> genres,
+        Set<DeveloperDto> developers,
         BigDecimal apiRating,
         String description
 ) {
diff --git a/src/main/java/com/videogamescatalogue/backend/dto/internal/game/GameWithStatusDto.java b/src/main/java/com/videogamescatalogue/backend/dto/internal/game/GameWithStatusDto.java
@@ -1,5 +1,6 @@
 package com.videogamescatalogue.backend.dto.internal.game;
 
+import com.videogamescatalogue.backend.dto.internal.developer.DeveloperDto;
 import com.videogamescatalogue.backend.dto.internal.genre.GenreDto;
 import com.videogamescatalogue.backend.dto.internal.platform.PlatformDto;
 import com.videogamescatalogue.backend.model.UserGame;
@@ -13,6 +14,7 @@ public record GameWithStatusDto(
         String backgroundImage,
         Set<PlatformDto> platforms,
         Set<GenreDto> genres,
+        Set<DeveloperDto> developers,
         BigDecimal apiRating,
         String description,
         UserGame.GameStatus status
diff --git a/src/main/java/com/videogamescatalogue/backend/dto/internal/user/UpdateUserRequestDto.java b/src/main/java/com/videogamescatalogue/backend/dto/internal/user/UpdateUserRequestDto.java
@@ -1,12 +1,9 @@
 package com.videogamescatalogue.backend.dto.internal.user;
 
-import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.Size;
 
 public record UpdateUserRequestDto(
         String profileName,
-        @Email(message = "Invalid format of email.")
-        String email,
         @Size(max = 5000, message = "About user info must be less than 5000 digits")
         String about,
         @Size(max = 50, message = "Location info must be less than 50 digits")
diff --git a/src/main/java/com/videogamescatalogue/backend/dto/internal/user/UserRegistrationResponseDto.java b/src/main/java/com/videogamescatalogue/backend/dto/internal/user/UserRegistrationResponseDto.java
@@ -0,0 +1,10 @@
+package com.videogamescatalogue.backend.dto.internal.user;
+
+public record UserRegistrationResponseDto(
+        Long id,
+        String profileName,
+        String about,
+        String location,
+        String token
+) {
+}
diff --git a/src/main/java/com/videogamescatalogue/backend/mapper/developer/DeveloperMapper.java b/src/main/java/com/videogamescatalogue/backend/mapper/developer/DeveloperMapper.java
@@ -0,0 +1,24 @@
+package com.videogamescatalogue.backend.mapper.developer;
+
+import com.videogamescatalogue.backend.config.MapperConfig;
+import com.videogamescatalogue.backend.dto.external.ApiResponseDeveloperDto;
+import com.videogamescatalogue.backend.dto.internal.developer.DeveloperDto;
+import com.videogamescatalogue.backend.model.Developer;
+import java.util.List;
+import java.util.Set;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+@Mapper(config = MapperConfig.class)
+public interface DeveloperMapper {
+    @Mapping(source = "id", target = "apiId")
+    @Mapping(target = "id", ignore = true)
+    Developer toModel(ApiResponseDeveloperDto apiResponseDeveloperDto);
+
+    Set<Developer> toModelSet(List<ApiResponseDeveloperDto> developers);
+
+    Set<DeveloperDto> toDtoSet(Set<Developer> developers);
+
+    DeveloperDto toDto(Developer developer);
+
+}
diff --git a/src/main/java/com/videogamescatalogue/backend/mapper/developer/DeveloperProvider.java b/src/main/java/com/videogamescatalogue/backend/mapper/developer/DeveloperProvider.java
@@ -0,0 +1,48 @@
+package com.videogamescatalogue.backend.mapper.developer;
+
+import com.videogamescatalogue.backend.dto.external.ApiResponseDeveloperDto;
+import com.videogamescatalogue.backend.dto.internal.developer.DeveloperDto;
+import com.videogamescatalogue.backend.model.Developer;
+import com.videogamescatalogue.backend.repository.DeveloperRepository;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import org.mapstruct.Named;
+import org.springframework.stereotype.Component;
+
+@RequiredArgsConstructor
+@Component
+public class DeveloperProvider {
+    private final DeveloperMapper developerMapper;
+    private final DeveloperRepository developerRepository;
+
+    @Named("toDevelopersSet")
+    public Set<Developer> toDevelopersSet(List<ApiResponseDeveloperDto> developers) {
+        List<Long> developerApiIds = developers.stream()
+                .map(ApiResponseDeveloperDto::id)
+                .toList();
+
+        List<Developer> existingDevelopers = developerRepository.findAllByApiIdIn(developerApiIds);
+
+        Map<Long, Developer> existingDevelopersMap = existingDevelopers.stream()
+                .collect(Collectors.toMap(
+                        Developer::getApiId,
+                        d -> d
+                ));
+
+        Set<Developer> developersSet = developers.stream()
+                .map(d -> existingDevelopersMap.getOrDefault(
+                        d.id(),
+                        developerMapper.toModel(d)))
+                .collect(Collectors.toSet());
+
+        return developersSet;
+    }
+
+    @Named("toDeveloperDtosSet")
+    public Set<DeveloperDto> toDeveloperDtosSet(Set<Developer> developers) {
+        return developerMapper.toDtoSet(developers);
+    }
+}
diff --git a/src/main/java/com/videogamescatalogue/backend/mapper/game/GameMapper.java b/src/main/java/com/videogamescatalogue/backend/mapper/game/GameMapper.java
@@ -6,6 +6,7 @@
 import com.videogamescatalogue.backend.dto.internal.game.GameDto;
 import com.videogamescatalogue.backend.dto.internal.game.GameWithStatusDto;
 import com.videogamescatalogue.backend.exception.ParsingException;
+import com.videogamescatalogue.backend.mapper.developer.DeveloperProvider;
 import com.videogamescatalogue.backend.mapper.genre.GenreProvider;
 import com.videogamescatalogue.backend.mapper.platform.PlatformProvider;
 import com.videogamescatalogue.backend.model.Game;
@@ -17,7 +18,11 @@
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 
-@Mapper(config = MapperConfig.class, uses = {PlatformProvider.class, GenreProvider.class})
+@Mapper(config = MapperConfig.class, uses = {
+        PlatformProvider.class,
+        GenreProvider.class,
+        DeveloperProvider.class
+})
 public interface GameMapper {
     List<Game> toModelList(List<ApiResponseGameDto> games);
 
@@ -34,14 +39,20 @@ public interface GameMapper {
     @Mapping(source = "released", target = "year", qualifiedByName = "toYear")
     @Mapping(source = "platforms", target = "platforms", qualifiedByName = "toPlatformsSet")
     @Mapping(source = "genres", target = "genres", qualifiedByName = "toGenresSet")
+    @Mapping(source = "developers", target = "developers", qualifiedByName = "toDevelopersSet")
     @Mapping(source = "rating", target = "apiRating")
     Game toModel(ApiResponseFullGameDto apiResponseGameDto);
 
     @Mapping(source = "platforms", target = "platforms", qualifiedByName = "toPlatformDtosSet")
     @Mapping(source = "genres", target = "genres", qualifiedByName = "toGenreDtosSet")
+    @Mapping(source = "developers", target = "developers", qualifiedByName = "toDeveloperDtosSet")
     GameDto toDto(Game game);
 
     @Mapping(target = "status", source = "status")
+    @Mapping(
+            source = "game.developers", target = "developers",
+            qualifiedByName = "toDeveloperDtosSet"
+    )
     GameWithStatusDto toDtoWithStatus(Game game, UserGame.GameStatus status);
 
     @Named("toYear")
diff --git a/src/main/java/com/videogamescatalogue/backend/mapper/user/UserMapper.java b/src/main/java/com/videogamescatalogue/backend/mapper/user/UserMapper.java
@@ -3,6 +3,7 @@
 import com.videogamescatalogue.backend.config.MapperConfig;
 import com.videogamescatalogue.backend.dto.internal.user.UpdateUserRequestDto;
 import com.videogamescatalogue.backend.dto.internal.user.UserRegistrationRequestDto;
+import com.videogamescatalogue.backend.dto.internal.user.UserRegistrationResponseDto;
 import com.videogamescatalogue.backend.dto.internal.user.UserResponseDto;
 import com.videogamescatalogue.backend.model.User;
 import org.mapstruct.Mapper;
@@ -17,5 +18,8 @@ public interface UserMapper {
     @Mapping(source = "id", target = "userGames", qualifiedByName = "getStatusDtoList")
     UserResponseDto toDto(User user);
 
+    @Mapping(source = "token", target = "token")
+    UserRegistrationResponseDto toRegistrationResponseDto(User user, String token);
+
     User updateProfileInfo(@MappingTarget User user, UpdateUserRequestDto requestDto);
 }
diff --git a/src/main/java/com/videogamescatalogue/backend/model/Developer.java b/src/main/java/com/videogamescatalogue/backend/model/Developer.java
@@ -0,0 +1,26 @@
+package com.videogamescatalogue.backend.model;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "developers")
+@Getter
+@Setter
+public class Developer {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, unique = true)
+    private Long apiId;
+
+    @Column(nullable = false)
+    private String name;
+}
diff --git a/src/main/java/com/videogamescatalogue/backend/model/Game.java b/src/main/java/com/videogamescatalogue/backend/model/Game.java
@@ -57,6 +57,15 @@ public class Game {
     )
     private Set<Genre> genres = new HashSet<>();
 
+    @ManyToMany
+    @JoinTable(
+            name = "games_developers",
+            joinColumns = @JoinColumn(name = "game_id"),
+            inverseJoinColumns = @JoinColumn(name = "developer_id"),
+            uniqueConstraints = @UniqueConstraint(columnNames = {"game_id", "developer_id"})
+    )
+    private Set<Developer> developers = new HashSet<>();
+
     private BigDecimal apiRating;
 
     private String description;
diff --git a/src/main/java/com/videogamescatalogue/backend/repository/DeveloperRepository.java b/src/main/java/com/videogamescatalogue/backend/repository/DeveloperRepository.java
@@ -0,0 +1,12 @@
+package com.videogamescatalogue.backend.repository;
+
+import com.videogamescatalogue.backend.model.Developer;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface DeveloperRepository extends JpaRepository<Developer, Long> {
+    Optional<Developer> findByApiId(Long apiId);
+
+    List<Developer> findAllByApiIdIn(List<Long> apiIds);
+}
diff --git a/src/main/java/com/videogamescatalogue/backend/service/game/GameServiceImpl.java b/src/main/java/com/videogamescatalogue/backend/service/game/GameServiceImpl.java
@@ -5,18 +5,23 @@
 import com.videogamescatalogue.backend.dto.internal.GameSearchParameters;
 import com.videogamescatalogue.backend.dto.internal.game.GameDto;
 import com.videogamescatalogue.backend.dto.internal.game.GameWithStatusDto;
+import com.videogamescatalogue.backend.mapper.developer.DeveloperMapper;
 import com.videogamescatalogue.backend.mapper.game.GameMapper;
+import com.videogamescatalogue.backend.model.Developer;
 import com.videogamescatalogue.backend.model.Game;
 import com.videogamescatalogue.backend.model.User;
 import com.videogamescatalogue.backend.model.UserGame;
+import com.videogamescatalogue.backend.repository.DeveloperRepository;
 import com.videogamescatalogue.backend.repository.GameRepository;
 import com.videogamescatalogue.backend.repository.SpecificationBuilder;
 import com.videogamescatalogue.backend.repository.UserGameRepository;
 import com.videogamescatalogue.backend.service.RawgApiClient;
+import jakarta.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
@@ -32,9 +37,11 @@
 public class GameServiceImpl implements GameService {
     private final RawgApiClient apiClient;
     private final GameMapper gameMapper;
+    private final DeveloperMapper developerMapper;
     private final GameRepository gameRepository;
     private final SpecificationBuilder<Game, GameSearchParameters> specificationBuilder;
     private final UserGameRepository userGameRepository;
+    private final DeveloperRepository developerRepository;
 
     @Override
     public void fetchBestGames() {
@@ -82,6 +89,7 @@ public Page<GameDto> getAllGamesFromDb(Pageable pageable) {
                 .map(gameMapper::toDto);
     }
 
+    @Transactional
     @Override
     public GameWithStatusDto getByApiId(Long apiId, User user) {
         Game game = findOrUpdate(apiId);
@@ -154,15 +162,26 @@ private Game findOrUpdate(Long apiId) {
         }
         Game game = gameOptional.get();
         if (game.getDescription() == null) {
-            return updateGameDescription(apiId, game);
+            updateGameDescription(apiId, game);
+        }
+        if (game.getDevelopers().isEmpty()) {
+            updateGameDevelopers(apiId, game);
         }
         return game;
     }
 
-    private Game updateGameDescription(Long apiId, Game game) {
+    private void updateGameDescription(Long apiId, Game game) {
         ApiResponseFullGameDto apiGame = apiClient.getGameById(apiId);
         game.setDescription(apiGame.description());
-        return gameRepository.save(game);
+        gameRepository.save(game);
+    }
+
+    private void updateGameDevelopers(Long apiId, Game game) {
+        ApiResponseFullGameDto apiGame = apiClient.getGameById(apiId);
+        Set<Developer> developers = developerMapper.toModelSet(apiGame.developers());
+        developerRepository.saveAll(developers);
+        game.setDevelopers(developers);
+        gameRepository.save(game);
     }
 
     private Game findFromApi(Long apiId) {
diff --git a/src/main/java/com/videogamescatalogue/backend/service/user/UserService.java b/src/main/java/com/videogamescatalogue/backend/service/user/UserService.java
@@ -3,11 +3,12 @@
 import com.videogamescatalogue.backend.dto.internal.user.ChangePasswordRequestDto;
 import com.videogamescatalogue.backend.dto.internal.user.UpdateUserRequestDto;
 import com.videogamescatalogue.backend.dto.internal.user.UserRegistrationRequestDto;
+import com.videogamescatalogue.backend.dto.internal.user.UserRegistrationResponseDto;
 import com.videogamescatalogue.backend.dto.internal.user.UserResponseDto;
 import com.videogamescatalogue.backend.model.User;
 
 public interface UserService {
-    UserResponseDto registerUser(
+    UserRegistrationResponseDto registerUser(
             UserRegistrationRequestDto requestDto
     );
 
diff --git a/src/main/java/com/videogamescatalogue/backend/service/user/UserServiceImpl.java b/src/main/java/com/videogamescatalogue/backend/service/user/UserServiceImpl.java
diff --git a/src/main/resources/db/changelog/changes/16-create-developers-table.yaml b/src/main/resources/db/changelog/changes/16-create-developers-table.yaml
diff --git a/src/main/resources/db/changelog/changes/17-create-games-developers-table.yaml b/src/main/resources/db/changelog/changes/17-create-games-developers-table.yaml
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
diff --git a/src/test/java/com/videogamescatalogue/backend/service/game/GameServiceImplTest.java b/src/test/java/com/videogamescatalogue/backend/service/game/GameServiceImplTest.java
diff --git a/src/test/java/com/videogamescatalogue/backend/service/user/UserServiceImplTest.java b/src/test/java/com/videogamescatalogue/backend/service/user/UserServiceImplTest.java
diff --git a/src/test/java/com/videogamescatalogue/backend/service/usergame/UserGameServiceImplTest.java b/src/test/java/com/videogamescatalogue/backend/service/usergame/UserGameServiceImplTest.java

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ public record ApiResponseFullGameDto(`
`15`	`15`
`16`	`16`	`List<ApiResponseGenreDto> genres,`
`17`	`17`
	`18`	`+ List<ApiResponseDeveloperDto> developers,`
	`19`	`+`
`18`	`20`	`BigDecimal rating`
`19`	`21`	`) {`
`20`	`22`	`}`