diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/endpoint/FavouriteActivityEndpoint.java b/backend/src/main/java/ca/bc/gov/backendstartapi/endpoint/FavouriteActivityEndpoint.java index 989bd0f51..06cd4aa27 100644 --- a/backend/src/main/java/ca/bc/gov/backendstartapi/endpoint/FavouriteActivityEndpoint.java +++ b/backend/src/main/java/ca/bc/gov/backendstartapi/endpoint/FavouriteActivityEndpoint.java @@ -44,7 +44,7 @@ public class FavouriteActivityEndpoint { * Creates to the logged user a {@link FavouriteActivityEntity} record based on the activity or * page title. * - * @param createDto a {@link FavouriteActivityCreateDto} with the activity title + * @param createDtos a {@link FavouriteActivityCreateDto} with the activity title * @return a {@link FavouriteActivityEntity} created */ @PostMapping(consumes = "application/json", produces = "application/json") @@ -52,8 +52,8 @@ public class FavouriteActivityEndpoint { summary = "Creates a Favourite Activities in bulk", description = """ - Creates Favourite Activities for the logged user in bulk based on an array of activity titles - or page names, with optional isConsep flags. + Creates Favourite Activities for the logged user in bulk based on an array + of activity titles or page names, with optional isConsep flags. """) @ApiResponses( value = { @@ -91,7 +91,8 @@ public ResponseEntity> createUserActivities( @Valid @RequestBody List createDtos) { - List entity = favouriteActivityService.createUserActivities(createDtos); + List entity = + favouriteActivityService.createUserActivities(createDtos); return ResponseEntity.status(HttpStatus.CREATED).body(entity); } diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/service/FavouriteActivityService.java b/backend/src/main/java/ca/bc/gov/backendstartapi/service/FavouriteActivityService.java index 51432e223..155bde0cd 100644 --- a/backend/src/main/java/ca/bc/gov/backendstartapi/service/FavouriteActivityService.java +++ b/backend/src/main/java/ca/bc/gov/backendstartapi/service/FavouriteActivityService.java @@ -9,7 +9,6 @@ import ca.bc.gov.backendstartapi.repository.FavouriteActivityRepository; import ca.bc.gov.backendstartapi.security.LoggedUserService; import jakarta.transaction.Transactional; - import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -38,21 +37,20 @@ public FavouriteActivityService( this.favouriteActivityRepository = favouriteActivityRepository; } -/** - * Validates the activity input. - */ -private void validateActivityInput(FavouriteActivityCreateDto activityDto) { - System.out.println("22222222: " + activityDto.activity()); + /** + * Validates the activity input. + */ + private void validateActivityInput(FavouriteActivityCreateDto activityDto) { if (Objects.isNull(activityDto.activity()) || activityDto.activity().isBlank()) { - System.out.println("33333333: " + activityDto.activity()); - throw new InvalidActivityException(); + throw new InvalidActivityException(); } } /** * Builds a FavouriteActivityEntity. */ - private FavouriteActivityEntity buildFavouriteActivityEntity(String userId, FavouriteActivityCreateDto dto) { + private FavouriteActivityEntity buildFavouriteActivityEntity( + String userId, FavouriteActivityCreateDto dto) { FavouriteActivityEntity entity = new FavouriteActivityEntity(); entity.setUserId(userId); entity.setActivity(dto.activity()); @@ -63,10 +61,11 @@ private FavouriteActivityEntity buildFavouriteActivityEntity(String userId, Favo /** * Create a user's activity in the database. * - * @param activityDto a {@link FavouriteActivityCreateDto} containing the activity title + * @param activityDtos a {@link FavouriteActivityCreateDto} containing the activity title * @return the {@link FavouriteActivityEntity} created */ - public List createUserActivities(List activityDtos) { + public List createUserActivities( + List activityDtos) { String userId = loggedUserService.getLoggedUserId(); SparLog.info("Creating activities for user {}", userId); diff --git a/backend/src/test/java/ca/bc/gov/backendstartapi/service/FavouriteActivityServiceTest.java b/backend/src/test/java/ca/bc/gov/backendstartapi/service/FavouriteActivityServiceTest.java index 63297b262..6196df523 100644 --- a/backend/src/test/java/ca/bc/gov/backendstartapi/service/FavouriteActivityServiceTest.java +++ b/backend/src/test/java/ca/bc/gov/backendstartapi/service/FavouriteActivityServiceTest.java @@ -7,7 +7,6 @@ import ca.bc.gov.backendstartapi.dto.FavouriteActivityCreateDto; import ca.bc.gov.backendstartapi.dto.FavouriteActivityUpdateDto; import ca.bc.gov.backendstartapi.entity.FavouriteActivityEntity; -import ca.bc.gov.backendstartapi.exception.FavoriteActivityExistsToUser; import ca.bc.gov.backendstartapi.exception.InvalidActivityException; import ca.bc.gov.backendstartapi.repository.FavouriteActivityRepository; import ca.bc.gov.backendstartapi.security.LoggedUserService; @@ -51,7 +50,8 @@ void createUserActivityTest() { FavouriteActivityCreateDto createDto = new FavouriteActivityCreateDto("CREATE_A_CLASS_SEEDLOT", false); - List entitiesSaved = favouriteActivityService.createUserActivities(List.of(createDto)); + List entitiesSaved = + favouriteActivityService.createUserActivities(List.of(createDto)); FavouriteActivityEntity entitySaved = entitiesSaved.get(0); Assertions.assertNotNull(entitySaved);