update

Author: fey

src/main/java/io/hexlet/project_devops_deploy/dto/BulletinDto.java

@@ -1,6 +1,6 @@
 package io.hexlet.project_devops_deploy.dto;
 
-import io.hexlet.project_devops_deploy.model.BulletinState;
+import io.hexlet.project_devops_deploy.model.bulletin.BulletinState;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;

src/main/java/io/hexlet/project_devops_deploy/dto/BulletinRequest.java

@@ -1,6 +1,6 @@
 package io.hexlet.project_devops_deploy.dto;
 
-import io.hexlet.project_devops_deploy.model.BulletinState;
+import io.hexlet.project_devops_deploy.model.bulletin.BulletinState;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;

src/main/java/io/hexlet/project_devops_deploy/exception/BulletinNotFoundException.java renamed to src/main/java/io/hexlet/project_devops_deploy/exception/ResourceNotFoundException.java

@@ -1,12 +1,12 @@
 package io.hexlet.project_devops_deploy.exception;
 
+
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ResponseStatus(HttpStatus.NOT_FOUND)
-public class BulletinNotFoundException extends RuntimeException {
-
-    public BulletinNotFoundException(Long id) {
-        super("Bulletin %d not found".formatted(id));
+public class ResourceNotFoundException extends RuntimeException {
+    public ResourceNotFoundException(String message) {
+        super(message);
     }
 }

src/main/java/io/hexlet/project_devops_deploy/mapper/JsonNullableMapper.java

@@ -0,0 +1,28 @@
+package io.hexlet.project_devops_deploy.mapper;
+
+import org.mapstruct.Condition;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+import org.openapitools.jackson.nullable.JsonNullable;
+
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public abstract class JsonNullableMapper {
+
+    /**
+     * Checks whether nullable parameter was passed explicitly.
+     *
+     * @return true if value was set explicitly, false otherwise
+     */
+    @Condition
+    public <T> boolean isPresent(JsonNullable<T> nullable) {
+        return nullable != null && nullable.isPresent();
+    }
+
+    public <T> T unwrap(JsonNullable<T> jsonNullable) {
+        return jsonNullable == null ? null : jsonNullable.orElse(null);
+    }
+
+    public <T> JsonNullable<T> wrap(T entity) {
+        return JsonNullable.of(entity);
+    }
+}

src/main/java/io/hexlet/project_devops_deploy/mapper/ReferenceMapper.java

@@ -0,0 +1,18 @@
+package io.hexlet.project_devops_deploy.mapper;
+
+import io.hexlet.project_devops_deploy.model.BaseEntity;
+import jakarta.persistence.EntityManager;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.TargetType;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public abstract class ReferenceMapper {
+    @Autowired
+    private EntityManager entityManager;
+
+    public <T extends BaseEntity> T toEntity(Long id, @TargetType Class<T> entityClass) {
+        return id != null ? entityManager.find(entityClass, id) : null;
+    }
+}

src/main/java/io/hexlet/project_devops_deploy/model/BulletinState.java renamed to src/main/java/io/hexlet/project_devops_deploy/model/BaseEntity.java

@@ -1,5 +1,4 @@
 package io.hexlet.project_devops_deploy.model;
 
-public enum BulletinState {
-    DRAFT, PUBLISHED
+public interface BaseEntity {
 }

src/main/java/io/hexlet/project_devops_deploy/model/Bulletin.java

@@ -9,15 +9,20 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
+import io.hexlet.project_devops_deploy.model.bulletin.BulletinState;
 import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
+@Getter
+@Setter
 @Entity
 @Table(name = "bulletins")
 @EntityListeners(AuditingEntityListener.class)
-public class Bulletin {
+public class Bulletin implements BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -44,59 +49,4 @@ public class Bulletin {
     @Column(name = "updated_at", nullable = false)
     private LocalDateTime updatedAt;
 
-    public String getContact() {
-        return contact;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public BulletinState getState() {
-        return state;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setContact(String contact) {
-        this.contact = contact;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public void setState(BulletinState state) {
-        this.state = state;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public LocalDateTime getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(LocalDateTime createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public LocalDateTime getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(LocalDateTime updatedAt) {
-        this.updatedAt = updatedAt;
-    }
 }

src/main/java/io/hexlet/project_devops_deploy/model/bulletin/BulletinState.java

@@ -0,0 +1,5 @@
+package io.hexlet.project_devops_deploy.model.bulletin;
+
+public enum BulletinState {
+    DRAFT, PUBLISHED
+}

src/main/java/io/hexlet/project_devops_deploy/service/BulletinService.java

@@ -2,9 +2,9 @@
 
 import io.hexlet.project_devops_deploy.dto.BulletinDto;
 import io.hexlet.project_devops_deploy.dto.BulletinRequest;
-import io.hexlet.project_devops_deploy.exception.BulletinNotFoundException;
-import io.hexlet.project_devops_deploy.mapper.BulletinMapper;
+import io.hexlet.project_devops_deploy.exception.ResourceNotFoundException;
 import io.hexlet.project_devops_deploy.model.Bulletin;
+import io.hexlet.project_devops_deploy.mapper.BulletinMapper;
 import io.hexlet.project_devops_deploy.repository.BulletinRepository;
 import java.util.List;
 import org.springframework.stereotype.Service;
@@ -43,7 +43,7 @@ public BulletinDto findById(Long id) {
     }
 
     private Bulletin getBulletin(Long id) {
-        return repository.findById(id).orElseThrow(() -> new BulletinNotFoundException(id));
+        return repository.findById(id).orElseThrow(() -> new ResourceNotFoundException("Bulletin has not found"));
     }
 
     public BulletinDto update(Long id, BulletinRequest request) {

src/main/java/io/hexlet/project_devops_deploy/util/ModelGenerator.java

@@ -1,7 +1,7 @@
 package io.hexlet.project_devops_deploy.util;
 
 import io.hexlet.project_devops_deploy.model.Bulletin;
-import io.hexlet.project_devops_deploy.model.BulletinState;
+import io.hexlet.project_devops_deploy.model.bulletin.BulletinState;
 import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 import net.datafaker.Faker;