diff --git a/src/main/java/ru/soune/nocopy/dto/complaint/ComplaintRequest.java b/src/main/java/ru/soune/nocopy/dto/complaint/ComplaintRequest.java index 7c7d695..0de3cce 100644 --- a/src/main/java/ru/soune/nocopy/dto/complaint/ComplaintRequest.java +++ b/src/main/java/ru/soune/nocopy/dto/complaint/ComplaintRequest.java @@ -21,9 +21,6 @@ public class ComplaintRequest { @JsonProperty("email") private String email; - @JsonProperty("links") - private List links; - @JsonProperty("status") private String status; diff --git a/src/main/java/ru/soune/nocopy/dto/complaint/ComplaintResponse.java b/src/main/java/ru/soune/nocopy/dto/complaint/ComplaintResponse.java index 4b86313..55efa91 100644 --- a/src/main/java/ru/soune/nocopy/dto/complaint/ComplaintResponse.java +++ b/src/main/java/ru/soune/nocopy/dto/complaint/ComplaintResponse.java @@ -28,9 +28,6 @@ public class ComplaintResponse { @JsonProperty("email") private String email; - @JsonProperty("links") - private List links; - @JsonProperty("created_at") private String createdAt; diff --git a/src/main/java/ru/soune/nocopy/entity/complaint/ComplaintEntity.java b/src/main/java/ru/soune/nocopy/entity/complaint/ComplaintEntity.java index d09a433..ab2b573 100644 --- a/src/main/java/ru/soune/nocopy/entity/complaint/ComplaintEntity.java +++ b/src/main/java/ru/soune/nocopy/entity/complaint/ComplaintEntity.java @@ -33,9 +33,6 @@ public class ComplaintEntity { @Column(name = "email") private String email; - @Column(name = "links", columnDefinition = "TEXT") - private String links; - @OneToOne(cascade = CascadeType.ALL) @JoinColumn(name = "violation_id") @ToString.Exclude diff --git a/src/main/java/ru/soune/nocopy/entity/complaint/ComplaintStatus.java b/src/main/java/ru/soune/nocopy/entity/complaint/ComplaintStatus.java index e65a83c..ca5deed 100644 --- a/src/main/java/ru/soune/nocopy/entity/complaint/ComplaintStatus.java +++ b/src/main/java/ru/soune/nocopy/entity/complaint/ComplaintStatus.java @@ -1,5 +1,6 @@ package ru.soune.nocopy.entity.complaint; public enum ComplaintStatus { - CREATED, IN_WORK, COMPLETED, CANCELLED + //NEW , SHOWED, LEGAL_IN_WORK, ЖАЛОБА, 3 + 4 , САНКЦАНИРОВАННОЕ ИСПОЛЬЗОВАНИЕ + CREATED, SHOWED, IN_WORK, COMPLETED, CANCELLED } diff --git a/src/main/java/ru/soune/nocopy/service/complaint/ComplaintEntityService.java b/src/main/java/ru/soune/nocopy/service/complaint/ComplaintEntityService.java index fafc277..94aad5d 100644 --- a/src/main/java/ru/soune/nocopy/service/complaint/ComplaintEntityService.java +++ b/src/main/java/ru/soune/nocopy/service/complaint/ComplaintEntityService.java @@ -57,7 +57,6 @@ public class ComplaintEntityService { .status(ComplaintStatus.CREATED) .complaintText(request.getComplaintText()) .email(request.getEmail()) - .links(linksJson) .violation(violation) .build(); @@ -105,13 +104,6 @@ public class ComplaintEntityService { } if (request.getComplaintText() != null) complaint.setComplaintText(request.getComplaintText()); if (request.getEmail() != null) complaint.setEmail(request.getEmail()); - if (request.getLinks() != null) { - try { - complaint.setLinks(objectMapper.writeValueAsString(request.getLinks())); - } catch (JsonProcessingException e) { - complaint.setLinks(request.getLinks().toString()); - } - } return mapToResponse(complaintRepository.save(complaint)); } @@ -124,22 +116,12 @@ public class ComplaintEntityService { } private ComplaintResponse mapToResponse(ComplaintEntity entity) { - List linksList = null; - if (entity.getLinks() != null) { - try { - linksList = objectMapper.readValue(entity.getLinks(), - objectMapper.getTypeFactory().constructCollectionType(List.class, String.class)); - } catch (JsonProcessingException e) { - log.warn("Failed to parse links JSON: {}", entity.getLinks()); - } - } return ComplaintResponse.builder() .id(entity.getId()) .status(entity.getStatus() != null ? entity.getStatus().name() : null) .complaintText(entity.getComplaintText()) .email(entity.getEmail()) - .links(linksList) .violationId(entity.getViolation() != null ? entity.getViolation().getId() : null) .createdAt(entity.getCreatedAt() != null ? entity.getCreatedAt().format(DATE_FORMATTER) : null) .updatedAt(entity.getUpdatedAt() != null ? entity.getUpdatedAt().format(DATE_FORMATTER) : null)