Implement checkbox checking

Konstantin Pankratov · Konstantin Pankratov · commit 5aafef12e625 · 2025-06-27T13:22:16.000+02:00
diff --git a/server/src/main/java/com/studybuddies/server/domain/ChapterEntity.java b/server/src/main/java/com/studybuddies/server/domain/ChapterEntity.java
@@ -6,7 +6,6 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,10 +24,7 @@ public class ChapterEntity {
   private Long id;
   private String title;
 
-  @OneToMany(mappedBy = "chapter", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+  @JoinColumn(name = "chapter_id")
   private List<CheckboxEntity> checkbox = new ArrayList<>();
-
-  @ManyToOne
-  @JoinColumn(name = "module_id")
-  private UserModule module;
 }
diff --git a/server/src/main/java/com/studybuddies/server/domain/CheckboxEntity.java b/server/src/main/java/com/studybuddies/server/domain/CheckboxEntity.java
@@ -4,8 +4,6 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotBlank;
 import java.util.UUID;
 import lombok.Data;
@@ -25,9 +23,5 @@ public class CheckboxEntity {
   private String title;
   private boolean checked;
 
-  @ManyToOne
-  @JoinColumn(name = "chapter_id")
-  private ChapterEntity chapter;
-
   private UUID userUuid;
 }
diff --git a/server/src/main/java/com/studybuddies/server/domain/UserEntity.java b/server/src/main/java/com/studybuddies/server/domain/UserEntity.java
@@ -4,6 +4,7 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToMany;
 import java.util.ArrayList;
 import java.util.List;
@@ -24,6 +25,7 @@ public class UserEntity {
   @Column(unique = true, nullable = false)
   String username;
 
-  @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+  @JoinColumn(name = "user_uuid")
   private List<UserModule> modules = new ArrayList<>();
 }
diff --git a/server/src/main/java/com/studybuddies/server/domain/UserModule.java b/server/src/main/java/com/studybuddies/server/domain/UserModule.java
@@ -7,7 +7,6 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import java.util.ArrayList;
 import java.util.List;
@@ -30,10 +29,7 @@ public class UserModule {
   private String examDate;
   private String examLoc;
 
-  @OneToMany(mappedBy = "module", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+  @JoinColumn(name = "module_id")
   private List<ChapterEntity> chapter = new ArrayList<>();
-
-  @ManyToOne
-  @JoinColumn(name = "user_uuid")
-  private UserEntity user;
 }
diff --git a/server/src/main/java/com/studybuddies/server/persistance/CheckboxRepository.java b/server/src/main/java/com/studybuddies/server/persistance/CheckboxRepository.java
@@ -1,10 +1,12 @@
 package com.studybuddies.server.persistance;
 
 import com.studybuddies.server.domain.CheckboxEntity;
+import java.util.List;
 import java.util.UUID;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface CheckboxRepository extends CrudRepository<CheckboxEntity, UUID> {
+  List<CheckboxEntity> findByUserUuid(UUID userUuid);
 }
diff --git a/server/src/main/java/com/studybuddies/server/persistance/MeetingRepository.java b/server/src/main/java/com/studybuddies/server/persistance/MeetingRepository.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
diff --git a/server/src/main/java/com/studybuddies/server/services/StudyGroupService.java b/server/src/main/java/com/studybuddies/server/services/StudyGroupService.java
@@ -19,7 +19,6 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Objects;
 
 @Service
 @AllArgsConstructor
diff --git a/server/src/main/java/com/studybuddies/server/services/chapter/ChapterCrudService.java b/server/src/main/java/com/studybuddies/server/services/chapter/ChapterCrudService.java
diff --git a/server/src/main/java/com/studybuddies/server/services/chapter/CheckboxCrudService.java b/server/src/main/java/com/studybuddies/server/services/chapter/CheckboxCrudService.java
@@ -6,24 +6,27 @@
 import com.studybuddies.server.services.interfaces.CRUDService;
 import com.studybuddies.server.web.dto.chapter.CheckboxChangeRequest;
 import com.studybuddies.server.web.dto.chapter.CheckboxCreationRequest;
-import com.studybuddies.server.web.dto.interfaces.ChangeRequest;
 import com.studybuddies.server.web.dto.interfaces.Responses;
-import com.studybuddies.server.web.mapper.CheckboxMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
 
-import java.util.Optional;
-import java.util.UUID;
 
+@Service
+@RequiredArgsConstructor
 public class CheckboxCrudService implements CRUDService<CheckboxCreationRequest, CheckboxChangeRequest, Responses> {
-    private CheckboxRepository checkboxRepository;
-    private CheckboxMapper checkboxMapper;
+
+    private final CheckboxRepository checkboxRepository;
 
     @Override
     public void update(String targetUUID, CheckboxChangeRequest r, String clientUUID) {
-
-
-
-
+        var checkboxes = checkboxRepository.findByUserUuid(UUIDService.parseUUID(clientUUID));
+
+        for(CheckboxEntity checkbox : checkboxes) {
+            var checkboxId = checkbox.getId().toString();
+            if(checkboxId.equals(r.checkboxId)) {
+                checkbox.setChecked(!checkbox.isChecked());
+                checkboxRepository.save(checkbox);
+            }
+        }
     }
-
-
 }
diff --git a/server/src/main/java/com/studybuddies/server/services/user/UserService.java b/server/src/main/java/com/studybuddies/server/services/user/UserService.java
@@ -5,8 +5,6 @@
 import com.studybuddies.server.domain.Filter;
 import com.studybuddies.server.domain.UserEntity;
 import com.studybuddies.server.domain.UserModule;
-import com.studybuddies.server.persistance.CheckboxRepository;
-import com.studybuddies.server.persistance.UserModuleRepository;
 import com.studybuddies.server.persistance.UserRepository;
 import com.studybuddies.server.services.UUIDService;
 import com.studybuddies.server.services.exceptions.ModuleNotFoundException;
@@ -18,7 +16,6 @@
 import com.studybuddies.server.web.dto.user.UserAccountSetupRequest;
 import com.studybuddies.server.web.dto.user.UserModuleReq;
 import com.studybuddies.server.web.dto.user.UserResponse;
-import com.studybuddies.server.web.mapper.ChapterMapper;
 import com.studybuddies.server.web.mapper.UserMapper;
 import com.studybuddies.server.web.mapper.UserModuleMapper;
 import com.studybuddies.server.web.mapper.exceptions.AccountSetupAlreadyFinished;
@@ -36,9 +33,6 @@ public class UserService implements
   private final UserMapper userMapper;
   private final UserModuleMapper userModuleMapper;
   private final ModuleValidationService moduleValidationService;
-  private final UserModuleRepository userModuleRepository;
-  private final ChapterMapper chapterMapper;
-  private final CheckboxRepository checkboxRepository;
 
   @Override
   public List<UserResponse> get(String userUUID, Filter filter) {
@@ -67,36 +61,6 @@ public void create(UserAccountSetupRequest userAccountSetupRequest, String userU
     userRepository.save(user);
   }
 
-  public void patch(List<UserModuleReq> requestList, String userUUID) {
-    Optional<UserEntity> maybeUser = userRepository.findById(UUIDService.parseUUID(userUUID));
-
-    if (maybeUser.isPresent()) {
-      UserEntity user = maybeUser.get();
-      List<UserModule> userModules = user.getModules();
-
-      List<CheckboxEntity> userCheckboxes = userModules.stream()
-          .flatMap(module -> module.getChapter().stream())
-          .flatMap(chapter -> chapter.getCheckbox().stream())
-          .toList();
-
-      List<CheckboxEntity> reqCheckboxes = requestList.stream()
-          .flatMap(module -> Arrays.stream(module.getChapter()))
-          .flatMap(
-              chapterEntityRequest -> chapterMapper.of(chapterEntityRequest).getCheckbox().stream())
-          .toList();
-
-      for (CheckboxEntity userCheckbox : userCheckboxes) {
-        for (CheckboxEntity reqCheckBox : reqCheckboxes) {
-          if (userCheckbox.getId() == reqCheckBox.getId()) {
-            CheckboxEntity candidate = checkboxRepository.findById(userCheckbox.getId()).get();
-            candidate.setChecked(!candidate.isChecked());
-            checkboxRepository.save(candidate);
-          }
-        }
-      }
-    }
-  }
-
   @Override
   public void update(String targetUUID, AccountChangeRequest accountChangeRequest,
       String clientUUID) {
@@ -143,24 +107,19 @@ public void updateModules(List<UserModuleReq> moduleUpdateRequest, String uuidSt
       }
 
       UserModule module = userModuleMapper.of(req);
-      module.setUser(user);
+      module.setName(module.getName().toUpperCase());
 
       if (module.getChapter() != null) {
         for (ChapterEntity chapter : module.getChapter()) {
-          module.setName(module.getName().toUpperCase());
-          chapter.setModule(module);
-
           if (chapter.getCheckbox() != null) {
             for (CheckboxEntity cb : chapter.getCheckbox()) {
-              cb.setChapter(chapter);
               cb.setUserUuid(uuid);
             }
           }
         }
       }
 
       user.getModules().add(module);
-      userModuleRepository.save(module);
     }
     userRepository.save(user);
   }
diff --git a/server/src/main/java/com/studybuddies/server/web/ChapterController.java b/server/src/main/java/com/studybuddies/server/web/ChapterController.java
diff --git a/server/src/main/java/com/studybuddies/server/web/CheckboxController.java b/server/src/main/java/com/studybuddies/server/web/CheckboxController.java
@@ -1,10 +1,7 @@
-/*
 package com.studybuddies.server.web;
 
-import com.studybuddies.server.services.chapter.ChapterCrudService;
 import com.studybuddies.server.services.chapter.CheckboxCrudService;
-import com.studybuddies.server.web.dto.chapter.ChapterCreationRequest;
-import com.studybuddies.server.web.dto.chapter.CheckboxCreationRequest;
+import com.studybuddies.server.web.dto.chapter.CheckboxChangeRequest;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -13,33 +10,15 @@
 
 @RestController
 @AllArgsConstructor
-@RequestMapping("/chapter")
+@RequestMapping("/checkbox")
 public class CheckboxController {
-    private CheckboxCrudService checkboxCrudService;
 
-    @PostMapping
-    public ResponseEntity<?> create(HttpServletRequest request,
-                                    @RequestBody CheckboxCreationRequest checkboxCreationRequest
-                                    ) {
-        String userUUID = request.getUserPrincipal().getName();
-        checkboxCrudService.create(checkboxCreationRequest, userUUID);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
+  private final CheckboxCrudService checkboxCrudService;
 
-    @PutMapping
-    public ResponseEntity<?> update(HttpServletRequest request,
-                                    @RequestBody CheckboxCreationRequest checkboxCreationRequest
-    ) {
-        String userUUID = request.getUserPrincipal().getName();
-
-    }
-
-    @DeleteMapping
-    public ResponseEntity<?> delete(HttpServletRequest request,
-                                    @RequestParam String targetUuid) {
-        String userUUID = request.getUserPrincipal().getName();
-        checkboxCrudService.delete(targetUuid, userUUID);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
+  @PostMapping
+  public ResponseEntity<?> check(HttpServletRequest r, @RequestBody
+      CheckboxChangeRequest checkboxChangeRequest) {
+    checkboxCrudService.update(null, checkboxChangeRequest, r.getUserPrincipal().getName());
+    return new ResponseEntity<>(checkboxChangeRequest.checkboxId, HttpStatus.OK);
+  }
 }
-*/
diff --git a/server/src/main/java/com/studybuddies/server/web/dto/chapter/CheckboxChangeRequest.java b/server/src/main/java/com/studybuddies/server/web/dto/chapter/CheckboxChangeRequest.java
@@ -3,7 +3,6 @@
 import com.studybuddies.server.web.dto.interfaces.ChangeRequest;
 
 public class CheckboxChangeRequest implements ChangeRequest {
+    public String checkboxId;
 
-    public String title;
-    public boolean checked;
 }
diff --git a/server/src/main/java/com/studybuddies/server/web/mapper/UserMapperUtils.java b/server/src/main/java/com/studybuddies/server/web/mapper/UserMapperUtils.java
@@ -4,7 +4,6 @@
 import com.studybuddies.server.web.dto.module.ModuleResponse;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 import org.mapstruct.Named;
 import org.springframework.stereotype.Component;
 
@@ -21,7 +20,7 @@ public List<ModuleResponse> userModulesToJson(List<UserModule> modules) {
             module.getExamLoc(),
             module.getChapter()
         ))
-        .collect(Collectors.toList());
+        .toList();
   }
 
 }
diff --git a/server/src/main/java/com/studybuddies/server/web/mapper/UserModuleMapper.java b/server/src/main/java/com/studybuddies/server/web/mapper/UserModuleMapper.java
@@ -8,7 +8,6 @@
 @Mapper(componentModel = "spring", uses = {ChapterMapper.class})
 public interface UserModuleMapper {
   @Mapping(target = "id", ignore = true)
-  @Mapping(target = "user", ignore = true)
   @Mapping(target = "chapter", source = "chapter")
   UserModule of(UserModuleReq dto);
 }
