impl(api-server): db

Create the enhanced set of unit and integration tests for the database

db/migrations/init/report-table-init.sql

@@ -7,7 +7,11 @@ CREATE TABLE IF NOT EXISTS report(
  placement varchar(128) NOT NULL,
  failure_date TIMESTAMP WITH TIME ZONE,
  proceeded_date TIMESTAMP WITH TIME ZONE,
- is_confirmed BOOLEAN NOT NULL,
- is_resolved BOOLEAN NOT NULL
+ owner_email varchar(128),
+ is_confirmed_by_analysis BOOLEAN NOT NULL,
+ is_confirmed_by_admin BOOLEAN NOT NULL,
+ is_resolved_by_user BOOLEAN NOT NULL,
+ is_resolved_by_admin BOOLEAN NOT NULL,
+ description varchar(256)
 );
 -- rollback DROP TABLE IF EXISTS report;

src/main/java/com/java/api/AdminPanelAPI.java

@@ -7,6 +7,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -43,7 +44,56 @@ public interface AdminPanelAPI {
  @GetMapping(
  headers = "Authorization"
  )
- ResponseEntity<Object> confirmReport(@RequestParam(value = "report_id") long reportId);
+ ResponseEntity<Void> confirmReport(@RequestParam(value = "report_id") long reportId);
+
+ @Operation(summary = "Resolve report with certain id")
+ @ApiResponses(value = {
+ @ApiResponse(responseCode = "200",
+ description = "Report successfully resolved",
+ content = @Content()
+ ),
+
+ @ApiResponse(responseCode = "400",
+ description = "Request was malformed",
+ content = @Content()),
+
+ @ApiResponse(responseCode = "403",
+ description = "Incorrect access token provided",
+ content = @Content()),
+
+ @ApiResponse(responseCode = "404",
+ description = "The entity is not found",
+ content = @Content())
+ })
+ @GetMapping(
+ path = "/resolve",
+ headers = "Authorization"
+ )
+ ResponseEntity<Void> resolveReportForcefully(@RequestParam(value = "report_id") long reportId);
+
+ @Operation(summary = "Resolve report with certain id")
+ @ApiResponses(value = {
+ @ApiResponse(responseCode = "200",
+ description = "Report successfully resolved",
+ content = @Content()
+ ),
+
+ @ApiResponse(responseCode = "400",
+ description = "Request was malformed",
+ content = @Content()),
+
+ @ApiResponse(responseCode = "403",
+ description = "Incorrect access token provided",
+ content = @Content())
+ })
+ @GetMapping(
+ path = "/resolveByMeta",
+ headers = "Authorization"
+ )
+ ResponseEntity<Void> resolveReportForcefullyByMeta(
+ @RequestParam @NotBlank String placement,
+ @RequestParam @NotBlank String category
+ );
 
  @Operation(summary = "Create confirmed report instantly")
  @ApiResponses(value = {
@@ -89,5 +139,5 @@ public interface AdminPanelAPI {
  @DeleteMapping(
  headers = "Authorization"
  )
- ResponseEntity<Object> deleteReport(@RequestParam(value = "report_id") long reportId);
+ ResponseEntity<Void> deleteReport(@RequestParam(value = "report_id") long reportId);
 }

src/main/java/com/java/api/AdminPanelController.java

@@ -11,8 +11,19 @@
 @RestController
 @Log4j2
 public class AdminPanelController implements AdminPanelAPI {
+
+ @Override
+ public ResponseEntity<Void> confirmReport(long reportId) {
+ return null;
+ }
+
+ @Override
+ public ResponseEntity<Void> resolveReportForcefully(long reportId) {
+ return null;
+ }
+
  @Override
- public ResponseEntity<Object> confirmReport(long reportId) {
+ public ResponseEntity<Void> resolveReportForcefullyByMeta(String placement, String category) {
  return null;
  }
 
@@ -22,7 +33,7 @@ public ResponseEntity<PostProcessReportResponse> createReport(PostProcessReportR
  }
 
  @Override
- public ResponseEntity<Object> deleteReport(long reportId) {
+ public ResponseEntity<Void> deleteReport(long reportId) {
  return null;
  }
 }

src/main/java/com/java/api/ReportAPI.java

@@ -17,6 +17,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -135,11 +136,34 @@ ResponseEntity<GetReportListResponse> getReportsByDateWindow(
  description = "Incorrect access token provided",
  content = @Content())
  })
+
  @GetMapping(
  path = "/allByCategory",
  headers = "Authorization"
  )
- ResponseEntity<GetReportListResponse> getReportsByCategory(@RequestBody @NotBlank String category);
+ ResponseEntity<GetReportListResponse> getReportsByCategory(@RequestParam @NotBlank String category);
+
+ @Operation(summary = "Get all the reports by the owner email")
+ @ApiResponses(value = {
+ @ApiResponse(responseCode = "200",
+ description = "Reports successfully returned",
+ content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = GetReportListResponse.class))
+ ),
+
+ @ApiResponse(responseCode = "400",
+ description = "Request was malformed",
+ content = @Content()),
+
+ @ApiResponse(responseCode = "403",
+ description = "Incorrect access token provided",
+ content = @Content())
+ })
+ @GetMapping(
+ path = "/allByEmail",
+ headers = "Authorization"
+ )
+ ResponseEntity<GetReportListResponse> getReportsByEmail(@RequestParam @NotBlank String ownerEmail);
 
  @Operation(summary = "Process report from the user")
  @ApiResponses(value = {
@@ -162,4 +186,29 @@ ResponseEntity<GetReportListResponse> getReportsByDateWindow(
  headers = "Authorization"
  )
  ResponseEntity<PostProcessReportResponse> processReport(@RequestBody @NotNull PostProcessReportRequest request);
+
+ @Operation(summary = "Resolve report from the user")
+ @ApiResponses(value = {
+ @ApiResponse(responseCode = "200",
+ description = "Report resolved successfully",
+ content = @Content()
+ ),
+
+ @ApiResponse(responseCode = "400",
+ description = "Request was malformed",
+ content = @Content()),
+
+ @ApiResponse(responseCode = "403",
+ description = "Incorrect access token provided",
+ content = @Content()),
+
+ @ApiResponse(responseCode = "404",
+ description = "The entity is not found",
+ content = @Content())
+ })
+ @PatchMapping(
+ consumes = MediaType.APPLICATION_JSON_VALUE,
+ headers = "Authorization"
+ )
+ ResponseEntity<Void> resolveReport(@RequestParam(value = "report_id") @Min(0) long reportId);
 }

src/main/java/com/java/api/ReportController.java

@@ -39,8 +39,18 @@ public ResponseEntity<GetReportListResponse> getReportsByCategory(String categor
  return null;
  }
 
+ @Override
+ public ResponseEntity<GetReportListResponse> getReportsByEmail(String ownerEmail) {
+ return null;
+ }
+
  @Override
  public ResponseEntity<PostProcessReportResponse> processReport(PostProcessReportRequest request) {
  return null;
  }
+
+ @Override
+ public ResponseEntity<Void> resolveReport(long reportId) {
+ return null;
+ }
 }

src/main/java/com/java/api/model/GetReportResponse.java

@@ -12,7 +12,11 @@ public record GetReportResponse(
  @Min(0) long id,
  @NotBlank String category,
  @NotBlank String placement,
+ String ownerEmail,
+ @NotNull OffsetDateTime failureDate,
  @NotNull OffsetDateTime lastSuccessfullyProceededDate,
- boolean isResolved
+ boolean isResolved,
+ boolean isConfirmed,
+ String description
 ) {
 }

src/main/java/com/java/api/model/PostProcessReportRequest.java

@@ -10,6 +10,8 @@
 public record PostProcessReportRequest(
  @NotBlank String category,
  @NotBlank String placement,
- @NotNull OffsetDateTime dateTime
+ @NotNull OffsetDateTime dateTime,
+ String ownerEmail,
+ String description
 ) {
 }

src/main/java/com/java/configuration/JpaDatabaseAccessConfiguration.java

@@ -0,0 +1,18 @@
+package com.java.configuration;
+
+import com.java.domain.repository.ReportRepository;
+import com.java.domain.service.ReportService;
+import com.java.domain.service.jpa.JpaReportService;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@RequiredArgsConstructor
+public class JpaDatabaseAccessConfiguration {
+ @Bean
+ public ReportService reportService(@NotNull ReportRepository reportRepository) {
+ return new JpaReportService(reportRepository);
+ }
+}

src/main/java/com/java/domain/model/Report.java

@@ -9,6 +9,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import java.time.OffsetDateTime;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -18,6 +19,7 @@
 @NoArgsConstructor
 @Getter
 @Setter
+@EqualsAndHashCode(of = {"id", "category", "placement"})
 public class Report {
  @Id
  @Column(nullable = false)
@@ -36,25 +38,39 @@ public class Report {
  @Convert(converter = DateTimeConverter.class)
  private OffsetDateTime proceededDate;
 
+ private String ownerEmail;
+
+ @Column(nullable = false)
+ private boolean isConfirmedByAnalysis;
+
+ @Column(nullable = false)
+ private boolean isConfirmedByAdmin;
+
  @Column(nullable = false)
- private boolean isConfirmed;
+ private boolean isResolvedByUser;
 
  @Column(nullable = false)
- private boolean isResolved;
+ private boolean isResolvedByAdmin;
 
- public Report(
+ @SuppressWarnings("checkstyle:ParameterNumber") public Report(
  String category,
  String placement,
  OffsetDateTime failureDate,
+ String ownerEmail,
  OffsetDateTime proceededDate,
- boolean isConfirmed,
- boolean isResolved
+ boolean isConfirmedByAnalysis,
+ boolean isConfirmedByAdmin,
+ boolean isResolvedByUser,
+ boolean isResolvedByAdmin
  ) {
  this.category = category;
  this.placement = placement;
  this.failureDate = failureDate;
+ this.ownerEmail = ownerEmail;
  this.proceededDate = proceededDate;
- this.isConfirmed = isConfirmed;
- this.isResolved = isResolved;
+ this.isConfirmedByAnalysis = isConfirmedByAnalysis;
+ this.isConfirmedByAdmin = isConfirmedByAdmin;
+ this.isResolvedByUser = isResolvedByUser;
+ this.isResolvedByAdmin = isResolvedByAdmin;
  }
 }

src/main/java/com/java/domain/repository/ReportRepository.java

@@ -16,8 +16,14 @@ public interface ReportRepository extends JpaRepository<Report, Long> {
 
  Optional<List<Report>> findAllByCategory(@NotBlank String category);
 
- Optional<List<Report>> findAllByProceededDateBeforeAndProceededDateAfter(
+ Optional<List<Report>> findAllByFailureDateAfterAndFailureDateBefore(
  @NotNull OffsetDateTime startWindow,
  @NotNull OffsetDateTime endWindow
  );
+
+ Optional<List<Report>> findAllByFailureDateAfter(@NotNull OffsetDateTime startWindow);
+
+ Optional<List<Report>> findAllByFailureDateBefore(@NotNull OffsetDateTime endWindow);
+
+ Optional<List<Report>> findAllByOwnerEmail(@NotBlank String email);
 }

src/main/java/com/java/domain/service/ReportService.java

@@ -23,9 +23,17 @@ public interface ReportService {
 
  @NotNull Optional<List<Report>> getAllReportsByDateWindows(OffsetDateTime startWindow, OffsetDateTime endWindow);
 
+ @NotNull Optional<List<Report>> getAllReportsByOwnerEmail(@NotBlank String ownerEmail);
+
  @NotNull Optional<PostProcessReportResponse> processReport(@NotNull PostProcessReportRequest request);
 
- boolean confirmReport(@Min(0) long id);
+ boolean confirmReportByAnalysis(@Min(0) long id);
+
+ boolean confirmReportByAdmin(@Min(0) long id);
+
+ boolean resolveReportByUser(@Min(0) long id);
+
+ boolean resolveReportByAdmin(@Min(0) long id);
 
  @NotNull Optional<PostProcessReportResponse> processReportForcefully(@NotNull PostProcessReportRequest request);