Skip to content

Commit

Permalink
fix: style
Browse files Browse the repository at this point in the history
  • Loading branch information
Xiao Peng authored and Xiao Peng committed Jan 8, 2025
1 parent a9848a5 commit 85875ed
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ 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")
@Operation(
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 = {
Expand Down Expand Up @@ -91,7 +91,8 @@ public ResponseEntity<List<FavouriteActivityEntity>> createUserActivities(
@Valid
@RequestBody
List<FavouriteActivityCreateDto> createDtos) {
List<FavouriteActivityEntity> entity = favouriteActivityService.createUserActivities(createDtos);
List<FavouriteActivityEntity> entity =
favouriteActivityService.createUserActivities(createDtos);
return ResponseEntity.status(HttpStatus.CREATED).body(entity);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand All @@ -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<FavouriteActivityEntity> createUserActivities(List<FavouriteActivityCreateDto> activityDtos) {
public List<FavouriteActivityEntity> createUserActivities(
List<FavouriteActivityCreateDto> activityDtos) {
String userId = loggedUserService.getLoggedUserId();
SparLog.info("Creating activities for user {}", userId);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -51,7 +50,8 @@ void createUserActivityTest() {

FavouriteActivityCreateDto createDto =
new FavouriteActivityCreateDto("CREATE_A_CLASS_SEEDLOT", false);
List<FavouriteActivityEntity> entitiesSaved = favouriteActivityService.createUserActivities(List.of(createDto));
List<FavouriteActivityEntity> entitiesSaved =
favouriteActivityService.createUserActivities(List.of(createDto));
FavouriteActivityEntity entitySaved = entitiesSaved.get(0);

Assertions.assertNotNull(entitySaved);
Expand Down

0 comments on commit 85875ed

Please sign in to comment.