Merge pull request #23 from AymaneTech/security

Security

Author: AymaneTech

pom.xml

@@ -101,6 +101,15 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
             <version>3.3.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/wora/state_of_dev/common/util/OptionalWrapper.java

@@ -0,0 +1,12 @@
+package com.wora.state_of_dev.common.util;
+
+import com.wora.state_of_dev.common.domain.exception.EntityNotFoundException;
+
+import java.util.Optional;
+
+public class OptionalWrapper {
+    public static <T> T orElseThrow(Optional<T> optional, String entity, Object id) {
+        return optional.orElseThrow(() -> new EntityNotFoundException(entity, id));
+    }
+
+}

src/main/java/com/wora/state_of_dev/owner/domain/Owner.java

@@ -9,14 +9,16 @@
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 @Entity
 @Table(name = "owners")
 
 @Getter
 @Setter
 @Accessors(chain = true)
 @NoArgsConstructor
-public class Owner {
+public class Owner implements Serializable {
 
     @EmbeddedId
     @AttributeOverride(name = "value", column = @Column(name = "id"))

src/main/java/com/wora/state_of_dev/survey/application/service/impl/DefaultQuestionService.java

@@ -23,6 +23,8 @@
 
 import java.util.List;
 
+import static com.wora.state_of_dev.common.util.OptionalWrapper.orElseThrow;
+
 @Service
 @Transactional
 @Validated
@@ -33,13 +35,14 @@ public class DefaultQuestionService implements QuestionService {
     private final QuestionMapper mapper;
     private final AnswerMapper answerMapper;
 
+    // todo : add findByChapterId, findBySurveyEditionId
+
     @Override
     public List<QuestionResponseDto> findAll() {
         return repository.findAll()
                 .stream().map(mapper::toResponseDto)
                 .toList();
     }
-    // todo : add findByChapterId, findBySurveyEditionId
 
     @Override
     public QuestionResponseDto findById(QuestionId id) {
@@ -51,11 +54,9 @@ public QuestionResponseDto findById(QuestionId id) {
     @Override
     public QuestionResponseDto create(QuestionRequestDto dto) {
         final ChapterId chapterId = new ChapterId(dto.chapterId());
-        Chapter chapter = chapterRepository.findById(chapterId)
-                .orElseThrow(() -> new EntityNotFoundException("chapter", dto.chapterId()));
+        Chapter chapter = orElseThrow(chapterRepository.findById(chapterId), "chapter", dto.chapterId());
 
-        if (chapterRepository.isHasSubChapters(chapterId))
-            throw new ChapterHasSubChaptersException(chapterId);
+        ensureHasNoSubChapters(chapterId);
 
         Question question = mapper.toEntity(dto)
                 .setChapter(chapter)
@@ -68,14 +69,13 @@ public QuestionResponseDto create(QuestionRequestDto dto) {
     @Override
     public QuestionResponseDto update(QuestionId id, QuestionRequestDto dto) {
         final ChapterId chapterId = new ChapterId(dto.chapterId());
-        Question question = repository.findById(id)
-                .orElseThrow(() -> new EntityNotFoundException("question", id.value()));
+        Question question = orElseThrow(repository.findById(id), "question", id.value());
+
+        ensureHasNoSubChapters(chapterId);
 
-        if (chapterRepository.isHasSubChapters(chapterId))
-            throw new ChapterHasSubChaptersException(chapterId);
 
-        Chapter chapter = chapterRepository.findById(chapterId)
-                .orElseThrow(() -> new EntityNotFoundException("chapter", dto.chapterId()));
+        Chapter chapter = orElseThrow(chapterRepository.findById(chapterId), "chapter", dto.chapterId());
+
         question.setText(dto.text())
                 .setAnswerType(dto.answerType())
                 .setChapter(chapter)
@@ -92,12 +92,17 @@ public void delete(QuestionId id) {
     }
 
     private List<Answer> mapAnswersDtoToEntities(List<AnswerRequestDto> answerRequestDtos) {
-        if(answerRequestDtos.isEmpty())
+        if (answerRequestDtos.isEmpty())
             throw new AnswersCannotBeEmptyException("Cannot create question without answers");
 
         return answerRequestDtos
                 .stream()
                 .map(answerMapper::toEntity)
                 .toList();
     }
+
+    private void ensureHasNoSubChapters(ChapterId chapterId) {
+        if (chapterRepository.isHasSubChapters(chapterId))
+            throw new ChapterHasSubChaptersException(chapterId);
+    }
 }

src/main/java/com/wora/state_of_dev/survey/domain/entities/Answer.java

@@ -7,14 +7,16 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 @Entity
 @Table(name = "answers")
 
 @Getter
 @Setter
 @Accessors(chain = true)
 @NoArgsConstructor
-public class Answer {
+public class Answer implements Serializable {
 
     @EmbeddedId
     @AttributeOverride(name = "value", column = @Column(name = "id"))

src/main/java/com/wora/state_of_dev/survey/domain/entities/Chapter.java

@@ -9,6 +9,7 @@
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -20,7 +21,7 @@
 @Accessors(chain = true)
 @NoArgsConstructor
 @ToString
-public class Chapter {
+public class Chapter implements Serializable {
 
     @EmbeddedId
     @AttributeOverride(name = "value", column = @Column(name = "id"))

src/main/java/com/wora/state_of_dev/survey/domain/entities/Question.java

@@ -8,6 +8,7 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.util.List;
 
 @Entity
@@ -17,7 +18,7 @@
 @Setter
 @Accessors(chain = true)
 @NoArgsConstructor
-public class Question {
+public class Question implements Serializable {
 
     @EmbeddedId
     @AttributeOverride(name = "value", column = @Column(name = "id"))

src/main/java/com/wora/state_of_dev/survey/domain/entities/Survey.java

@@ -9,14 +9,16 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 @Entity
 @Table(name = "surveys")
 
 @Getter
 @Setter
 @Accessors(chain = true)
 @NoArgsConstructor
-public class Survey {
+public class Survey implements Serializable {
 
     @EmbeddedId
     @AttributeOverride(name = "value", column = @Column(name = "id"))

src/main/java/com/wora/state_of_dev/survey/domain/entities/SurveyEdition.java

@@ -11,6 +11,7 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.Year;
 import java.util.ArrayList;
@@ -23,7 +24,7 @@
 @Setter
 @Accessors(chain = true)
 @RequiredArgsConstructor
-public class SurveyEdition {
+public class SurveyEdition implements Serializable {
 
     @EmbeddedId
     @AttributeOverride(name = "value", column = @Column(name = "id"))