Merge branch 'M2' into M2-user

# Conflicts:
#	README.md
#	application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/AnswerCreateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/AnswersCreateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/ExerciseCreateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/ExerciseDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/QuestionCreateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/QuestionDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/QuestionUpdateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/lecture/LectureCreateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/user/UserDto.java
#	application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/Answer.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerController.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerFacade.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerRepository.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerService.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/common/DomainObject.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/common/DomainService.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/Exercise.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseController.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseRepository.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseService.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/Question.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionController.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionFacade.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionRepository.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionService.java
#	application/module-exercise/src/main/resources/application.properties
#	application/module-exercise/src/test/java/org/fuseri/moduleexercise/answer/AnswerTest.java
#	application/module-exercise/src/test/java/org/fuseri/moduleexercise/exercise/ExerciseTest.java
#	application/module-exercise/src/test/java/org/fuseri/moduleexercise/question/QuestionTest.java
#	application/module-language-school/pom.xml
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/common/DomainObject.java
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/Course.java
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/CourseController.java
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/lecture/Lecture.java
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/lecture/LectureController.java
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserController.java
#	application/module-language-school/src/main/resources/application.properties
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseTest.java
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/lecture/LectureTest.java
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java

README.md

@@ -11,14 +11,37 @@
     - Martin Gargalovič *@xgargal*
     - Jan Pokorný *@xpokorn8*
     - Ester Vilímková - _Project Leader_ *@xvilimk*
+
+
 - **Assigment**:
     - Create a system for language school lecture management. Each lecture can occur on a given day and time and is related to some course. The course is defined by its (unique) name, language and proficiency level. However, each lecture will be independent. That means that each lecture can have a different topic. Different lecturers can give it, and an arbitrary number of students can enrol. Each lecturer will have a name, surname, and record of taught languages. In addition, the lecturer will indicate that they are a native speaker. Exercises can be prepared for each course to allow the students to learn the language. Each student can pick the exercises depending on the levels of difficulty.
 
-- **Running the modules**:
-    - ```cd ./application```
-    - ```mvn clean install```
-    - ```cd ./module-*```
-    - ```mvn spring-boot:run```
+
+- **Running the modules using docker-compose**:
+
+    ```console
+    cd ./application
+    mvn clean install
+    docker-compose build --parallel
+    docker-compose up
+    ```
+
+- **Running the modules using podman-compose**:
+    ~~~console
+    cd ./application
+    mvn clean install
+    podman-compose build --parallel
+    podman-compose up
+    ~~~
+
+- **Running the modules using docker**:
+    ~~~console
+   sudo docker run -d -p 5001:5001 xpokorn8/sprachschulsystem:certificate &&
+   sudo docker run -d -p 5002:5002 xpokorn8/sprachschulsystem:exercise &&
+   sudo docker run -d -p 5000:5000 xpokorn8/sprachschulsystem:language-school &&
+   sudo docker run -d -p 5003:5003 xpokorn8/sprachschulsystem:mail
+    ~~~
+
 
 # Project Description
 

application/docker-compose.yml

+version: '3'
+
+services:
+  certificate:
+    build: ./module-certificate
+    container_name: certificate
+    image: xpokorn8/sprachschulsystem:certificate
+    ports:
+      - "5001:5001"
+
+  exercise:
+    build: ./module-exercise
+    container_name: exercise
+    image: xpokorn8/sprachschulsystem:exercise
+    ports:
+      - "5002:5002"
+
+  language-school:
+    build: ./module-language-school
+    container_name: language-school
+    image: xpokorn8/sprachschulsystem:language-school
+    ports:
+      - "5000:5000"
+
+  mail:
+    build: ./module-mail
+    container_name: mail
+    image: xpokorn8/sprachschulsystem:mail
+    ports:
+      - "5003:5003"
\ No newline at end of file

application/model/src/main/java/org/fuseri/model/dto/course/CourseCreateDto.java

@@ -28,10 +28,10 @@ public class CourseCreateDto {
 
     @NotNull(message = "Language type is required")
     @Valid
-    private LanguageTypeDto languageTypeDto;
+    private LanguageTypeDto language;
 
     @NotNull(message = "Proficiency level is required")
     @Valid
-    private ProficiencyLevelDto proficiencyLevelDto;
+    private ProficiencyLevelDto proficiency;
 
 }

application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java

@@ -20,7 +20,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = true)
 public class CourseDto extends DomainObjectDto {
 
     @NotBlank(message = "Course name is required")
@@ -33,22 +33,22 @@ public class CourseDto extends DomainObjectDto {
 
     @NotNull(message = "Language type is required")
     @Valid
-    private LanguageTypeDto languageTypeDto;
+    private LanguageTypeDto language;
 
     @NotNull(message = "Proficiency level is required")
     @Valid
-    private ProficiencyLevelDto proficiencyLevelDto;
+    private ProficiencyLevelDto proficiency;
 
     @NotNull(message = "Student's list is required")
     @Valid
     private List<Long> studentIds;
 
-    public CourseDto(String name, Integer capacity, LanguageTypeDto languageTypeDto, ProficiencyLevelDto proficiencyLevelDto) {
-        setId(0L);
+    public CourseDto(Long id, String name, Integer capacity, LanguageTypeDto languageTypeDto, ProficiencyLevelDto proficiencyLevelDto) {
+        this.setId(id);
         this.name = name;
         this.capacity = capacity;
-        this.languageTypeDto = languageTypeDto;
-        this.proficiencyLevelDto = proficiencyLevelDto;
+        this.language = languageTypeDto;
+        this.proficiency = proficiencyLevelDto;
         this.studentIds = new ArrayList<>();
     }
 }

application/model/src/main/java/org/fuseri/model/dto/course/LanguageTypeDto.java

 package org.fuseri.model.dto.course;
 
-import lombok.AllArgsConstructor;
-
-@AllArgsConstructor
 public enum LanguageTypeDto {
     ENGLISH,
     GERMAN,

application/model/src/main/java/org/fuseri/model/dto/exercise/AnswerCreateDto.java

@@ -15,6 +15,6 @@ public class AnswerCreateDto {
     @NotNull
     private boolean correct;
 
-    @NotNull
-    private long questionId;
+    @NotBlank
+    private String questionId;
 }

application/model/src/main/java/org/fuseri/model/dto/exercise/AnswersCreateDto.java

 package org.fuseri.model.dto.exercise;
 
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -11,8 +11,8 @@ import java.util.List;
 @Getter
 public class AnswersCreateDto {
 
-    @NotNull
-    private long questionId;
+    @NotBlank
+    private String questionId;
 
     @Valid
     private List<AnswerInQuestionCreateDto> answers;

application/model/src/main/java/org/fuseri/model/dto/exercise/ExerciseCreateDto.java

@@ -20,6 +20,6 @@ public class ExerciseCreateDto {
     @PositiveOrZero
     private int difficulty;
 
-    @NotNull
-    private long courseId;
+    @NotBlank
+    private String courseId;
 }

application/model/src/main/java/org/fuseri/model/dto/exercise/ExerciseDto.java

@@ -23,18 +23,28 @@ public class ExerciseDto extends DomainObjectDto {
     @PositiveOrZero
     private int difficulty;
 
-    @NotNull
-    private long courseId;
+    @NotBlank
+    private String courseId;
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof ExerciseDto that)) return false;
-        return getDifficulty() == that.getDifficulty() && getCourseId() == that.getCourseId() && Objects.equals(getName(), that.getName()) && Objects.equals(getDescription(), that.getDescription());
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ExerciseDto that = (ExerciseDto) o;
+
+        if (difficulty != that.difficulty) return false;
+        if (!Objects.equals(name, that.name)) return false;
+        if (!Objects.equals(description, that.description)) return false;
+        return Objects.equals(courseId, that.courseId);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getName(), getDescription(), getDifficulty(), getCourseId());
+        int result = name != null ? name.hashCode() : 0;
+        result = 31 * result + (description != null ? description.hashCode() : 0);
+        result = 31 * result + difficulty;
+        result = 31 * result + (courseId != null ? courseId.hashCode() : 0);
+        return result;
     }
 }

application/model/src/main/java/org/fuseri/model/dto/exercise/QuestionCreateDto.java

@@ -2,7 +2,6 @@ package org.fuseri.model.dto.exercise;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -15,8 +14,8 @@ public class QuestionCreateDto {
     @NotBlank
     private String text;
 
-    @NotNull
-    private long exerciseId;
+    @NotBlank
+    private String exerciseId;
 
     @Valid
     private List<AnswerInQuestionCreateDto> answers;

application/model/src/main/java/org/fuseri/model/dto/exercise/QuestionDto.java

@@ -2,7 +2,6 @@ package org.fuseri.model.dto.exercise;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 import org.fuseri.model.dto.common.DomainObjectDto;
@@ -17,8 +16,8 @@ public class QuestionDto extends DomainObjectDto {
     @NotBlank
     private String text;
 
-    @NotNull
-    private long exerciseId;
+    @NotBlank
+    private String exerciseId;
 
     @Valid
     private List<AnswerDto> answers;
@@ -26,12 +25,20 @@ public class QuestionDto extends DomainObjectDto {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof QuestionDto that)) return false;
-        return getExerciseId() == that.getExerciseId() && Objects.equals(getText(), that.getText()) && Objects.equals(getAnswers(), that.getAnswers());
+        if (o == null || getClass() != o.getClass()) return false;
+
+        QuestionDto that = (QuestionDto) o;
+
+        if (!Objects.equals(text, that.text)) return false;
+        if (!Objects.equals(exerciseId, that.exerciseId)) return false;
+        return Objects.equals(answers, that.answers);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getText(), getExerciseId(), getAnswers());
+        int result = text != null ? text.hashCode() : 0;
+        result = 31 * result + (exerciseId != null ? exerciseId.hashCode() : 0);
+        result = 31 * result + (answers != null ? answers.hashCode() : 0);
+        return result;
     }
 }

application/model/src/main/java/org/fuseri/model/dto/exercise/QuestionUpdateDto.java

 package org.fuseri.model.dto.exercise;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -12,6 +11,6 @@ public class QuestionUpdateDto {
     @NotBlank
     private String text;
 
-    @NotNull
-    private long exerciseId;
+    @NotBlank
+    private String exerciseId;
 }

application/model/src/main/java/org/fuseri/model/dto/lecture/LectureCreateDto.java

@@ -3,7 +3,6 @@ package org.fuseri.model.dto.lecture;
 import jakarta.validation.constraints.*;
 import lombok.Getter;
 import lombok.Setter;
-import org.fuseri.model.dto.course.CourseDto;
 
 import java.time.LocalDateTime;
 
@@ -27,10 +26,10 @@ public class LectureCreateDto {
     @Min(value = 1, message = "Lecture capacity must be at least 1")
     private Integer capacity;
 
-    @NotBlank(message = "Lecture course cannot be blank")
-    private String courseId;
+    @NotNull(message = "Lecture course cannot be null")
+    private Long courseId;
 
-    public LectureCreateDto(LocalDateTime from, LocalDateTime to, String topic, Integer capacity, String courseId) {
+    public LectureCreateDto(LocalDateTime from, LocalDateTime to, String topic, Integer capacity, Long courseId) {
         this.from = from;
         this.to = to;
         this.topic = topic;

application/model/src/main/java/org/fuseri/model/dto/lecture/LectureDto.java

@@ -29,16 +29,16 @@ public class LectureDto extends DomainObjectDto {
     @Min(value = 1, message = "Lecture capacity must be at least 1")
     private Integer capacity;
 
-    @NotNull(message = "Lecture capacity cannot be null")
-    private String lecturerId;
+    @NotNull(message = "Lecture lecturer cannot be null")
+    private Long lecturerId;
 
-    @NotBlank(message = "Lecture courseId cannot be blank")
-    private String courseId;
+    @NotNull(message = "Lecture courseId cannot be null")
+    private Long courseId;
 
     @NotNull(message = "Student IDs list cannot be null")
     private List<Long> studentIds;
 
-    public LectureDto(LocalDateTime from, LocalDateTime to, String topic, Integer capacity, String lecturerId, String courseId) {
+    public LectureDto(LocalDateTime from, LocalDateTime to, String topic, Integer capacity, Long lecturerId, Long courseId) {
         this.from = from;
         this.to = to;
         this.topic = topic;

application/module-certificate/Dockerfile

+FROM docker.io/library/eclipse-temurin:17-jre-focal
+COPY ./target/module-certificate-0.0.1-SNAPSHOT.jar /app.jar
+ENTRYPOINT ["java", "-jar", "/app.jar"]

application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java

@@ -2,7 +2,9 @@ package org.fuseri.modulecertificate.service;
 
 import jakarta.validation.Valid;
 import org.fuseri.model.dto.certificate.CertificateCreateDto;
+import org.fuseri.model.dto.certificate.CertificateDto;
 import org.fuseri.model.dto.certificate.CertificateSimpleDto;
+import org.fuseri.model.dto.common.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java

@@ -9,12 +9,16 @@ import org.fuseri.model.dto.course.ProficiencyLevelDto;
 import org.fuseri.model.dto.user.AddressDto;
 import org.fuseri.model.dto.user.UserDto;
 import org.junit.jupiter.api.Test;
+import org.springdoc.core.converters.models.Pageable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
+import java.util.List;
+
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
@@ -99,14 +103,14 @@ class CertificateControllerTests {
                 .andExpect(status().is4xxClientError());
     }
 
-//    @Test
-//    void findCertificateIdForUserAndCourse() throws Exception {
-//        mockMvc.perform(get("/certificates/findForUserAndCourse")
-//                        .param("userId", "0")
-//                        .param("courseId", "0"))
-//                .andExpect(status().isOk())
-//                .andExpect(content().string("[]"));
-//    }
+    @Test
+    void findCertificateIdForUserAndCourse() throws Exception {
+        mockMvc.perform(get("/certificates/findForUserAndCourse")
+                        .param("userId", "0")
+                        .param("courseId", "0"))
+                .andExpect(status().isOk())
+                .andExpect(content().string("[]"));
+    }
 
     @Test
     void findCertificateIdWithoutUserId() throws Exception {
@@ -149,10 +153,10 @@ class CertificateControllerTests {
                         .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk());
 
-//        mockMvc.perform(get("/certificates/findAll")
-//                .content("{ \"page\": 0, \"size\": 1, \"sort\": []}")
-//                .contentType(MediaType.APPLICATION_JSON))
-//                .andExpect(status().isOk());
+        mockMvc.perform(get("/certificates/findAll")
+                .content("{ \"page\": 0, \"size\": 1, \"sort\": []}")
+                .contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk());
     }
 
     @Test

application/module-exercise/Dockerfile

+FROM docker.io/library/eclipse-temurin:17-jre-focal
+COPY ./target/module-exercise-0.0.1-SNAPSHOT.jar /app.jar
+ENTRYPOINT ["java", "-jar", "/app.jar"]

application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/Answer.java

 package org.fuseri.moduleexercise.answer;
 
-import jakarta.persistence.*;
 import lombok.*;
 import org.fuseri.moduleexercise.common.DomainObject;
-import org.fuseri.moduleexercise.question.Question;
 
 /**
  * Represent Answer entity
@@ -14,16 +12,10 @@ import org.fuseri.moduleexercise.question.Question;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Entity
-@Table(name = "answer")
 public class Answer extends DomainObject {
-
     private String text;
 
-    @Column(name = "is_correct")
     private boolean correct;
 
-    @ManyToOne
-    @JoinColumn(name="question_id")
-    private Question question;
+    private String questionId;
 }

application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerController.java

 package org.fuseri.moduleexercise.answer;
 
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import jakarta.persistence.EntityNotFoundException;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
 import org.fuseri.model.dto.exercise.AnswerCreateDto;
 import org.fuseri.model.dto.exercise.AnswerDto;
 import org.fuseri.model.dto.exercise.AnswersCreateDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
@@ -32,24 +28,30 @@ public class AnswerController {
         this.facade = facade;
     }
 
+    /**
+     * Retrieve a list of AnswerDto objects which belong to question with questionId
+     *
+     * @param questionId the ID of the question for which to retrieve answers
+     * @return a List of AnswerDto objects
+     */
+    @GetMapping("/{question-id}")
+    public List<AnswerDto> findAllByQuestionId(@NotBlank @PathVariable("question-id") String questionId) {
+        return facade.findAllByQuestionId(questionId);
+    }
+
     /**
      * Create a new answer for the given question ID
      *
      * @param dto the AnswerCreateDto object containing information about the answer to create
-     * @return a ResponseEntity containing an AnswerDto object representing the newly created answer, or a 404 Not Found response
-     * if the question with the specified ID in dto was not found
+     * @return an AnswerDto object representing the newly created answer
+     * @throws ResponseStatusException if the question ID specified in the dto does not exist
      */
-    @Operation(summary = "Create new answers for question", description = "Creates new answers for question.")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "201", description = "Answers created successfully."),
-            @ApiResponse(responseCode = "400", description = "Invalid input.")
-    })
     @PostMapping
-    public ResponseEntity<List<AnswerDto>> createMultiple(@Valid @RequestBody AnswersCreateDto dto) {
+    public List<AnswerDto> createMultiple(@Valid @RequestBody AnswersCreateDto dto) {
         try {
-            return ResponseEntity.status(HttpStatus.CREATED).body(facade.createMultiple(dto));
+            return facade.createMultiple(dto);
         } catch (EntityNotFoundException e) {
-            return ResponseEntity.notFound().build();
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, e.getMessage());
         }
     }
 
@@ -58,42 +60,30 @@ public class AnswerController {
      *
      * @param id  of answer to update
      * @param dto dto with updated answer information
-     * @return A ResponseEntity with an AnswerDto object representing the updated answer on an HTTP status code of 200 if the update was successful.
-     * or a NOT_FOUND response if the answer ID is invalid
+     * @throws ResponseStatusException if the question id specified in the AnswerCreateDto dto does not exist
      */
-    @Operation(summary = "Update an answer", description = "Updates an answer with the specified ID.")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "Answer with the specified ID updated successfully."),
-            @ApiResponse(responseCode = "400", description = "Invalid input."),
-            @ApiResponse(responseCode = "404", description = "Answer with the specified ID was not found.")
-    })
     @PutMapping("/{id}")
-    public ResponseEntity<AnswerDto> update(@NotNull @PathVariable long id, @Valid @RequestBody AnswerCreateDto dto) {
+    public AnswerDto update(@NotBlank @PathVariable String id, @Valid @RequestBody AnswerCreateDto dto) {
         try {
-            return ResponseEntity.ok(facade.update(id, dto));
+            return facade.update(id, dto);
         } catch (EntityNotFoundException e) {
-            return ResponseEntity.notFound().build();
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND,
+                    e.getMessage());
         }
     }
 
     /**
-     * Delete answer with the specified ID
+     * Delete answer with the given id
      *
      * @param id of answer to delete
      * @throws ResponseStatusException if answer with specified id does not exist
      */
-    @Operation(summary = "Delete an answer with specified ID", description = "Deletes an answer with the specified ID.")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "204", description = "Answer with the specified ID deleted successfully."),
-            @ApiResponse(responseCode = "404", description = "Answer with the specified ID was not found.")
-    })
     @DeleteMapping("/{id}")
-    public ResponseEntity<Void> delete(@NotNull @PathVariable long id) {
+    public void delete(@NotBlank @PathVariable String id) {
         try {
             facade.delete(id);
-            return ResponseEntity.noContent().build();
         } catch (EntityNotFoundException e) {
-            return ResponseEntity.notFound().build();
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, e.getMessage());
         }
     }
 }