Skip to content

Commit 13dbcf1

Browse files
authored
Merge pull request #50 from Halbes-Byte/feature/test
Feature/test
2 parents a60e5b3 + e47e509 commit 13dbcf1

23 files changed

+1736
-144
lines changed

server/src/main/java/com/studybuddies/server/services/chapter/CheckboxCrudService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import lombok.RequiredArgsConstructor;
1111
import org.springframework.stereotype.Service;
1212

13-
1413
@Service
1514
@RequiredArgsConstructor
1615
public class CheckboxCrudService implements CRUDService<CheckboxCreationRequest, CheckboxChangeRequest, Responses> {
@@ -29,4 +28,4 @@ public void update(String targetUUID, CheckboxChangeRequest r, String clientUUID
2928
}
3029
}
3130
}
32-
}
31+
}

server/src/main/java/com/studybuddies/server/services/meeting/MeetingSpecificationService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
@RequiredArgsConstructor
1616
public class MeetingSpecificationService {
1717

18-
1918
public static Specification<MeetingEntity> isThisWeek() {
2019
return (root, query, builder) -> {
2120
LocalDate today = LocalDate.now();

server/src/main/java/com/studybuddies/server/services/module/ModuleUtilService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@Service
77
@AllArgsConstructor
88
public class ModuleUtilService {
9-
protected String normalizeModuleName(String moduleName) {
9+
public String normalizeModuleName(String moduleName) {
1010
return moduleName.toLowerCase().replaceAll("[^a-z0-9]", "");
1111
}
1212
}

server/src/main/java/com/studybuddies/server/services/user/UserService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public void create(UserAccountSetupRequest userAccountSetupRequest, String userU
6565
public void update(String targetUUID, AccountChangeRequest accountChangeRequest,
6666
String clientUUID) {
6767
UUID uuid = UUIDService.parseUUID(targetUUID);
68+
6869
if (existsByUUID(uuid)) {
6970
UserEntity user = userRepository.findById(uuid).get();
7071
user.setModules(accountChangeRequest.modules);
@@ -118,7 +119,6 @@ public void updateModules(List<UserModuleReq> moduleUpdateRequest, String uuidSt
118119
}
119120
}
120121
}
121-
122122
user.getModules().add(module);
123123
}
124124
userRepository.save(user);

server/src/main/java/com/studybuddies/server/web/CheckboxController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class CheckboxController {
1515

1616
private final CheckboxCrudService checkboxCrudService;
1717

18-
@PostMapping
18+
//@PostMapping
1919
public ResponseEntity<?> check(HttpServletRequest r, @RequestBody
2020
CheckboxChangeRequest checkboxChangeRequest) {
2121
checkboxCrudService.update(null, checkboxChangeRequest, r.getUserPrincipal().getName());

server/src/main/java/com/studybuddies/server/web/dto/chapter/CheckboxChangeRequest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@
44

55
public class CheckboxChangeRequest implements ChangeRequest {
66
public String checkboxId;
7-
87
}

server/src/main/java/com/studybuddies/server/web/dto/chapter/CheckboxCreationRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44

55
public class CheckboxCreationRequest implements CreationRequest {
66
public String title;
7+
public boolean checked;
78
}

server/src/main/java/com/studybuddies/server/web/dto/module/ModuleCreationRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
import jakarta.validation.constraints.NotBlank;
55
import jakarta.validation.constraints.Size;
66
import lombok.Getter;
7+
import lombok.Setter;
78

89
@Getter
10+
@Setter
911
public class ModuleCreationRequest implements CreationRequest {
1012
@NotBlank
1113
@Size(min = 5, max = 50, message = "Please provide the entire module name")

server/src/main/java/com/studybuddies/server/web/dto/user/UserAccountSetupRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@ public class UserAccountSetupRequest implements CreationRequest {
99

1010
@NotBlank
1111
public String username;
12-
13-
// Todo: Add Modules here and in the UserEntity. Then write a mapstruct mapping function.
1412
}

server/src/main/java/com/studybuddies/server/web/mapper/ChapterMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@Mapper(componentModel = "spring", uses = {CheckboxMapper.class})
99
public interface ChapterMapper {
1010
@Mapping(target = "id", ignore = true)
11-
@Mapping(target = "title", ignore = true)
11+
@Mapping(target = "title", source = "title")
1212
@Mapping(target = "checkbox", source = "checkbox")
1313
ChapterEntity of(ChapterCreationRequest dto);
1414
}

0 commit comments

Comments
 (0)