Merge pull request #34 from SlimusMinus/add-reward

added reward text

src/main/java/com/krylov/refound/ai/config/AiProperties.java

@@ -16,7 +16,7 @@ public class AiProperties {
   private String url;
 
   /**
-   * 5 seconds
+   * 10 seconds
    */
   private int timeout;
 }

src/main/java/com/krylov/refound/controller/PostController.java

@@ -55,9 +55,10 @@ public class PostController {
   public PostResponse update(@PathVariable Long id, @RequestParam String type, @RequestParam String title, @RequestParam(required = false) String address,
       @RequestParam(required = false) Double latitude, @RequestParam(required = false) Double longitude, @RequestParam(required = false) String description,
       @RequestParam(required = false) String category, @RequestParam(required = false) String phone, @RequestParam(required = false) Boolean reward,
+      @RequestParam(required = false) String rewardText,
       @RequestParam(value = "images", required = false) List<MultipartFile> images, @RequestParam(value = "existingImages", required = false) String existingImagesJson) {
     log.info("update post {}", id);
-    return service.update(id, type, title, address, latitude, longitude, description, category, phone, reward, images, existingImagesJson);
+    return service.update(id, type, title, address, latitude, longitude, description, category, phone, reward, rewardText, images, existingImagesJson);
   }
 
   @DeleteMapping("/{id}")

src/main/java/com/krylov/refound/dto/PostRequest.java

@@ -20,4 +20,5 @@ public class PostRequest {
   private String address;
   private String rulesAccepted;
   private Boolean reward;
+  private String rewardText;
 }

src/main/java/com/krylov/refound/dto/PostResponse.java

@@ -28,4 +28,5 @@ public class PostResponse {
   private Role userRole;
   private String rulesAccepted;
   private Boolean reward;
+  private String rewardText;
 }

src/main/java/com/krylov/refound/entity/Post.java

@@ -43,6 +43,7 @@ public class Post {
   private String phone;
   private String rulesAccepted;
   private Boolean isReward;
+  private String reward;
 
   @Enumerated(EnumType.STRING)
   private PostType type;

src/main/java/com/krylov/refound/mapper/PostMapper.java

@@ -14,12 +14,15 @@ import java.util.List;
 public interface PostMapper {
 
   @Mapping(source = "category", target = "category", qualifiedByName = "stringToPostCategory")
+  @Mapping(source = "rewardText", target = "reward")
   Post toEntity(PostRequest request);
 
   @Mapping(source = "user.id", target = "userId")
   @Mapping(source = "user.login", target = "userEmail")
   @Mapping(source = "images", target = "images", qualifiedByName = "imagesToUrls")
   @Mapping(target = "category", expression = "java(post.getCategory().getDisplayName())")
+  @Mapping(source = "isReward", target = "reward")
+  @Mapping(source = "reward", target = "rewardText")
   PostResponse toResponse(Post post);
 
   @Named("imagesToUrls")

src/main/java/com/krylov/refound/service/PostService.java

@@ -135,7 +135,8 @@ public class PostService {
    */
   @Transactional
   public PostResponse update(Long id, String type, String title, String address, Double latitude,
-      Double longitude, String description, String category, String phone, Boolean reward, List<MultipartFile> images, String existingImagesJson) {
+      Double longitude, String description, String category, String phone, Boolean reward,
+      String rewardText, List<MultipartFile> images, String existingImagesJson) {
 
     PostRequest request = new PostRequest();
     request.setType(PostType.from(type));
@@ -147,6 +148,7 @@ public class PostService {
     request.setLongitude(longitude);
     request.setAddress(address);
     request.setReward(reward);
+    request.setRewardText(rewardText);
 
     List<String> existingUrls = parseExistingImages(existingImagesJson);
 
@@ -166,6 +168,7 @@ public class PostService {
     post.setPhone(request.getPhone());
     post.setType(request.getType());
     post.setIsReward(request.getReward());
+    post.setReward(request.getRewardText());
 
     if (request.getLatitude() != null && request.getLongitude() != null) {
       post.setLatitude(request.getLatitude());

src/main/resources/application.yaml

@@ -35,7 +35,7 @@ minio:
 
 ai:
   url: ${AI_SERVICE_URL:http://localhost:8000}
-  timeout: 5
+  timeout: 10
   retry:
     max-attempts: 3
     delay: 500

src/main/resources/db/changelog/add/015-add-desc-reward-posts.yaml

@@ -0,0 +1,11 @@
+databaseChangeLog:
+  - changeSet:
+      id: 015-add-desc-reward-column
+      author: you
+      changes:
+        - addColumn:
+            tableName: posts
+            columns:
+              - column:
+                  name: reward
+                  type: VARCHAR(255)

src/main/resources/db/changelog/db.changelog-master.yaml

@@ -19,3 +19,4 @@ databaseChangeLog:
   - include: { file: db/changelog/create/009-create-statistic.yaml }
   - include: { file: db/changelog/alter/011-alter-posts-district-length.yaml}
   - include: { file: db/changelog/add/014-add-reward-posts.yaml }
+  - include: { file: db/changelog/add/015-add-desc-reward-posts.yaml }