Feat/281 Controlador y endpoint completo para ver recursos de un reto

CHANGELOG.md

@@ -1,8 +1,13 @@
 ## CHANGELOG
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). 
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+* Issue #852: Added GET endpoint in the Challenge Microservice to retrieve resources associated to a challenge
+* Issue #849: Added GET endpoint to retrieve all User's bookmarked challenges.
+* Issue #843: Added DELETE endpoint in the Challenge Microservice to unbookmark a challenge.
 * Issue #843: Added DELETE endpoint in the Challenge Microservice to unbookmark a challenge.
+* Issue #852: Added GET endpoint for retrieving resources from a challenge
 * Issue #829: Added bookmark POST endpoint in the Challenge Microservice to bookmark a challenge.
 * Issue #827: Added bookmark POST endpoint in the User Microservice to bookmark a challenge.
 * Issue #831: Added DELETE endpoint for user's bookmals in User Microservice.

contributors.md

@@ -82,4 +82,10 @@
 * Albert Marín Miranda - https://github.com/Almami679
 * Alexandra Bonet - https://github.com/AlexandraBonetCanela
 * Gwénaël Le Moing - https://github.com/g-lemoing
-* Matías Meza - https://github.com/RustyGearBox
+* Matías Meza - https://github.com/RustyGearBox
+* Marc Bernabeu Rodriguez - https://github.com/trisk910
+* Toni Jiménez - https://github.com/tonijimenez72
+* Enric Vicente - https://github.com/EnricW
+* Ismael Peiró - https://github.com/IsmaPeiro
+* Santiago Hernandez Beltran - https://github.com/shernandez334
+* Inga Demetrashvili - https://github.com/IngaD89

itachallenge-auth/src/main/java/com/itachallenge/auth/service/AuthService.java

@@ -5,7 +5,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
@@ -39,7 +38,6 @@ public class AuthService implements IAuthService {
 
     private final String clientSecret;
 
-    @Autowired
     public AuthService(WebClient.Builder webClientBuilder,
                        @Value("${spring.security.oauth2.client.provider.github.token-uri}") String githubTokenUri,
                        @Value("${spring.security.oauth2.client.provider.github.user-info-uri}") String githubUserInfoUri,

itachallenge-challenge/src/main/java/com/itachallenge/challenge/controller/ChallengeSolvedController.java

@@ -0,0 +1,53 @@
+package com.itachallenge.challenge.controller;
+
+import com.itachallenge.challenge.dto.SolvedDto;
+import com.itachallenge.challenge.exception.BadRequestException;
+import com.itachallenge.challenge.exception.JwtException;
+import com.itachallenge.challenge.service.IChallengeService;
+import com.itachallenge.challenge.service.IJwtService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import lombok.RequiredArgsConstructor;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Mono;
+
+@RestController
+@Validated
+@RequestMapping(value = "/itachallenge/api/v1/challenge")
+@RequiredArgsConstructor
+public class ChallengeSolvedController {
+
+    private static final Logger log = LoggerFactory.getLogger(ChallengeSolvedController.class);
+
+    private IChallengeService challengeService;
+    private IJwtService jwtService;
+
+    @PostMapping("/challenges/{challengeId}/solved")
+    @Operation(
+            operationId = "Add a challenge to User's solved challenges.",
+            summary = "Add a challenge to solved challenges.",
+            description = "The ID Challenge sent through the URI is added to the user's solved challenges. User Id is determined from the headers.",
+            responses = {
+                    @ApiResponse(responseCode = "200", content = {@Content(schema = @Schema(implementation = SolvedDto.class), mediaType = "application/json")}),
+                    @ApiResponse(responseCode = "400", description = "Missing or invalid authorization header."),
+                    @ApiResponse(responseCode = "404", description = "The Challenge with given Id was not found."),
+                    @ApiResponse(responseCode = "500", description = "Internal Server Error")
+            }
+    )
+    public Mono<ResponseEntity<SolvedDto>> addChallengeToSolved(
+            @PathVariable String challengeId,
+            @RequestHeader(name = "Authorization", required = false) String authHeader) {
+        return Mono.fromCallable(() -> jwtService.getUserUuIdFromAuthenticationHeader(authHeader))
+                .onErrorMap(JwtException.class, e -> new BadRequestException(e.getMessage()))
+                .flatMap(userId -> challengeService.addChallengeToSolved(challengeId, userId))
+                .doOnError(error -> log.error("Error adding challenge to solved: {}", error.getMessage()))
+                .map(ResponseEntity::ok);
+    }
+}

itachallenge-challenge/src/main/java/com/itachallenge/challenge/controller/ResourceController.java

@@ -1,18 +1,28 @@
 package com.itachallenge.challenge.controller;
 import com.itachallenge.challenge.dto.ResourceDto;
+
 import com.itachallenge.challenge.service.IResourceService;
 import io.swagger.v3.oas.annotations.Operation;
+
+import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import jakarta.validation.Valid;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.UUID;
+
 @RestController
 @Validated
 @RequestMapping(value = "/itachallenge/api/v1/resource")
@@ -41,5 +51,18 @@ public Mono<ResponseEntity<ResourceDto>> createNewResource(@RequestBody @Valid R
         return resourceService.createResource(resourceDto)
                 .map(createdResource -> ResponseEntity.ok().body(createdResource));
     }
+
+
+    @GetMapping("/challenge/{challengeId}")
+    @Operation(summary = "Get resources by challenge ID")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "Resources found"),
+            @ApiResponse(responseCode = "400", description = "Invalid challenge ID"),
+            @ApiResponse(responseCode = "404", description = "No resources found"),
+            @ApiResponse(responseCode = "500", description = "Internal Server Error")
+    })
+    public Flux<ResourceDto> getResourcesByChallengeId(@PathVariable UUID challengeId) {
+        return resourceService.getResourcesByChallengeId(challengeId);
+    }
 }
 

itachallenge-challenge/src/main/java/com/itachallenge/challenge/document/ChallengeDocument.java

@@ -48,6 +48,9 @@ public class ChallengeDocument {
     @Field(name="times_bookmark")
     private Integer timesBookmark;
 
+    @Field(name="times_solved")
+    private Integer timesSolved;
+
     @Field(name = "tags")
     private List<UUID> tags;
 
@@ -80,5 +83,10 @@ public void increaseTimesBookmark() {
     public void decreaseTimesBookmark() {
         timesBookmark =Integer.max(timesBookmark == null ? 0 : timesBookmark - 1, 0);
     }
+
+    public void increaseTimesSolved() {
+        timesSolved = timesSolved == null ? 1 : timesSolved + 1;
+    }
+
 
 }

itachallenge-challenge/src/main/java/com/itachallenge/challenge/dto/ChallengeDto.java

@@ -63,4 +63,8 @@ public class ChallengeDto {
 
     @JsonProperty(index = 11)
     private Integer timesBookmark;
+
+    @JsonProperty(index = 12)
+    private Integer timesSolved;
+
 }

itachallenge-challenge/src/main/java/com/itachallenge/challenge/dto/SolvedDto.java

@@ -0,0 +1,14 @@
+package com.itachallenge.challenge.dto;
+
+import lombok.*;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class SolvedDto {
+
+    private boolean isSolved;
+
+    private int timesSolved;
+
+}

itachallenge-challenge/src/main/java/com/itachallenge/challenge/enums/UserChallengeActionType.java

@@ -2,5 +2,6 @@
 
 public enum UserChallengeActionType {
     BOOKMARKS,
-    FAVORITES
+    FAVORITES,
+    SOLVED
 }

itachallenge-challenge/src/main/java/com/itachallenge/challenge/exception/GlobalExceptionHandler.java

@@ -62,7 +62,7 @@ public ResponseEntity<MessageDto> handleChallengeNotFoundReturn404Exception(Chal
 
     @ExceptionHandler(ResourceNotFoundException.class)
     public ResponseEntity<MessageDto> handleResourceNotFoundException(ResourceNotFoundException ex) {
-        return ResponseEntity.ok().body(new MessageDto(ex.getMessage()));
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new MessageDto(ex.getMessage()));
     }
 
     @ExceptionHandler(LanguageNotFoundException.class)

itachallenge-challenge/src/main/java/com/itachallenge/challenge/helper/DocumentToDtoConverter.java

@@ -54,7 +54,8 @@ protected String convert(LocalDateTime creationDateFromDocument) {
                     .addMapping(ChallengeDocument::getTitle, ChallengeDto::setTitle)
                     .addMapping(ChallengeDocument::getTimesFavorite, ChallengeDto::setTimesFavorite)
                     .addMapping(ChallengeDocument::getTags, ChallengeDto::setTags)
-                    .addMapping(ChallengeDocument::getTimesBookmark, ChallengeDto::setTimesBookmark);
+                    .addMapping(ChallengeDocument::getTimesBookmark, ChallengeDto::setTimesBookmark)
+                    .addMapping(ChallengeDocument::getTimesSolved, ChallengeDto::setTimesSolved);
             mapper.addConverter(converterFromLocalDateTimeToString);
         }
 

itachallenge-challenge/src/main/java/com/itachallenge/challenge/repository/ResourceRepository.java

@@ -25,4 +25,5 @@ public interface ResourceRepository extends ReactiveSortingRepository<ResourceDo
     Flux<ResourceDocument> saveAll(Flux<ResourceDocument> resourceDocumentFlux);
     Mono<Void> deleteAll();
 
+    Flux<ResourceDocument> findByChallengeIdsContaining(UUID challengeId);
 }

itachallenge-challenge/src/main/java/com/itachallenge/challenge/service/ChallengeServiceImpl.java

@@ -448,5 +448,33 @@ public Mono<BookmarkDto> removeChallengeFromBookmarks(String challengeId, String
                 });
     }
 
+@Override
+public Mono<SolvedDto> addChallengeToSolved(String challengeId, String userId) {
+    Mono<UUID> challengeIdMono = validateUUID(challengeId);
+    Mono<UUID> userIdMono = validateUUID(userId);
+
+    return Mono.zip(challengeIdMono, userIdMono)
+            .flatMap(uuidTuple -> {
+                UUID challengeUuid = uuidTuple.getT1();
+                UUID userUuid = uuidTuple.getT2();
+
+                return challengeRepository.findByUuid(challengeUuid)
+                        .switchIfEmpty(Mono.error(new ChallengeNotFoundReturn404Exception(
+                                String.format(CHALLENGE_NOT_FOUND_ERROR, challengeUuid))))
+                        .flatMap(challenge -> {
+                            log.info("It should be connected to user service using the fields {} and {}", challengeUuid, userUuid);
+
+                            //The part of the user service is not implemented yet, it should be connected to the user service in the future.
+
+                            if (Optional.ofNullable(challenge.getTimesSolved()).orElse(0) == 0) {
+                                challenge.increaseTimesSolved();
+                                return challengeRepository.save(challenge);
+                            }
+
+                            return Mono.just(challenge);
+                        })
+                        .map(updatedChallenge -> new SolvedDto(true, updatedChallenge.getTimesSolved()));
+            });
+}
 
 }

itachallenge-challenge/src/main/java/com/itachallenge/challenge/service/IChallengeService.java

@@ -42,4 +42,6 @@ Flux<GenericResultDto<ChallengeDto>> getChallengesByFilter(Optional<String> idLa
     Mono<FavoriteDto> removeChallengeFromFavorites(String challengeId, String userId);
 
     Mono<BookmarkDto> removeChallengeFromBookmarks(String challengeId, String userId);
+
+    Mono<SolvedDto> addChallengeToSolved(String challengeId, String userId);
 }

itachallenge-challenge/src/main/java/com/itachallenge/challenge/service/IResourceService.java

@@ -1,12 +1,15 @@
 package com.itachallenge.challenge.service;
 
 import com.itachallenge.challenge.dto.*;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.UUID;
 
 
 public interface IResourceService {
     Mono<ResourceDto> createResource(ResourceDto resourceDto);
 
+    Flux<ResourceDto> getResourcesByChallengeId(UUID challengeId);
 }
 

itachallenge-challenge/src/main/java/com/itachallenge/challenge/service/IUserService.java

@@ -9,4 +9,6 @@ public interface IUserService {
     Mono<Boolean> removeChallengeFromFavorites(String userId, String challengeId);
 
     Mono<Boolean> removeChallengeFromBookmarks(String userId, String challengeId);
+
+    Mono<Boolean> addChallengeToSolved(String userId, String challengeId);
 }

itachallenge-challenge/src/main/java/com/itachallenge/challenge/service/ResourceServiceImpl.java

@@ -5,12 +5,16 @@
 import com.itachallenge.challenge.dto.ResourceDto;
 import com.itachallenge.challenge.enums.AssociationType;
 import com.itachallenge.challenge.enums.Topic;
+import com.itachallenge.challenge.exception.BadRequestException;
+import com.itachallenge.challenge.exception.InternalServerErrorException;
+import com.itachallenge.challenge.exception.ResourceNotFoundException;
 import com.itachallenge.challenge.helper.DocumentToDtoConverter;
 import com.itachallenge.challenge.repository.ResourceRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.*;
@@ -135,4 +139,22 @@ private Mono<ResourceDto> saveResource(ResourceDto resourceDto) {
                 })
                 .doOnError(error -> log.error("Error occurred when creating resource {}", error.getMessage()));
     }
+
+
+    public Flux<ResourceDto> getResourcesByChallengeId(UUID challengeId) {
+        return Mono.justOrEmpty(challengeId)
+                .switchIfEmpty(Mono.error(new BadRequestException("Challenge ID cannot be null")))
+                .flatMapMany(validChallengeId ->
+                        resourceRepository.findByChallengeIdsContaining(validChallengeId)
+                                .switchIfEmpty(Mono.error(new ResourceNotFoundException("No resources found for challenge ID: " + validChallengeId))) // Lanzar 404 si no se encuentra nada
+                                .map(resourceDoc -> resourceConverter.convertDocumentToDto(resourceDoc, ResourceDto.class))
+                                .onErrorResume(error -> {
+                                    log.error("Error fetching resources for challenge ID {}: {}", validChallengeId, error.getMessage());
+                                    if (error instanceof ResourceNotFoundException) {
+                                        return Flux.error(error);
+                                    }
+                                    return Flux.error(new InternalServerErrorException("Failed to fetch resources for challenge ID: " + validChallengeId));
+                                })
+                );
+    }
 }

itachallenge-challenge/src/main/java/com/itachallenge/challenge/service/UserServiceImpl.java

@@ -24,6 +24,7 @@ public class UserServiceImpl implements IUserService {
     private final String userServiceUrl;
     private final String X_FAVORITE_MESSAGE = "X-Favorite-Message";
     private final String X_BOOKMARK_MESSAGE = "X-Bookmark-Message";
+    private final String X_SOLVED_MESSAGE = "X-Solved-Message";
 
     public UserServiceImpl(
             WebClient.Builder webClientBuilder,
@@ -42,6 +43,11 @@ public Mono<Boolean> addChallengeToBookmarks(String userId, String challengeId)
         return callEndpoint(userId, challengeId, UserChallengeActionType.BOOKMARKS, X_BOOKMARK_MESSAGE, HttpMethod.POST);
     }
 
+    @Override
+    public Mono<Boolean> addChallengeToSolved(String userId, String challengeId) {
+        return callEndpoint(userId, challengeId, UserChallengeActionType.SOLVED, X_SOLVED_MESSAGE, HttpMethod.POST);
+    }
+
     @Override
     public Mono<Boolean> removeChallengeFromFavorites(String userId, String challengeId) {
         return callEndpoint(userId, challengeId, UserChallengeActionType.FAVORITES, X_FAVORITE_MESSAGE, HttpMethod.DELETE);