Changeset b8a8d06

Timestamp:

10/16/21 15:07:33 (3 years ago)

Author:

KostaFortumanov <kfortumanov@…>

Branches:

master

Children:

2d8c0e7

Parents:

7888b17

Message:

bug fix

Location:

src/main

Files:

• java/it/finki/charitable/controller/DonationPostController.java (modified) (7 diffs)
• resources/templates/post.html (modified) (2 diffs)
• resources/templates/reportPost.html (modified) (1 diff)
• resources/templates/upload.html (modified) (1 diff)

src/main/java/it/finki/charitable/controller/DonationPostController.java

@@ -50 +50 @@
                           @RequestParam String telekom,
                           @RequestParam String a1,
-                          @RequestParam(defaultValue = "2021-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dateDue,
+                          @RequestParam(defaultValue = "2020-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dateDue,
                           @RequestParam String bankAccount,
                           @RequestParam MultipartFile titleImage,
@@ -56 +56 @@
                           @RequestParam MultipartFile[] moderatorImages) {
 
+        System.out.println(moderatorImages.length);
+        if(titleImage.isEmpty() || (moderatorImages.length == 1 && moderatorImages[0].isEmpty())) {
+            model.addAttribute("error", true);
+            return "upload";
+        }
+
+        if(title.isBlank() || fundsNeeded.isBlank() || currency.isBlank() || description.isBlank() || bankAccount.isBlank() || dateDue.equals(LocalDate.of(2020,1,1))) {
+            model.addAttribute("error", true);
+            return "upload";
+        }
+
         DonationPost post = new DonationPost();
         post.setTitle(title);
@@ -61 +72 @@
         try {
             float funds = Float.parseFloat(fundsNeeded);
+            if (funds <= 0) {
+                model.addAttribute("error", true);
+                return "upload";
+            }
             post.setFundsNeeded(funds);
         } catch (NumberFormatException e) {
-            e.printStackTrace();
+            model.addAttribute("error", true);
+            return "upload";
         }
 
@@ -215 +231 @@
     }
 
-    @RequestMapping("/donate")
+    @RequestMapping(value="/donate", method = RequestMethod.POST)
     public String donate(Model model, @RequestParam Long postid,
                          @RequestParam String cardName,
@@ -221 +237 @@
                          @RequestParam String expiryDate,
                          @RequestParam String cvv,
-                         @RequestParam float amount) {
+                         @RequestParam String amount) {
 
         DonationPost post = donationPostService.getById(postid);
-        FundsCollected funds = new FundsCollected("Online donation", amount);
+        if(post == null || !post.getApproved()) {
+            return "index";
+        }
+
+        float donatedAmount;
+        try {
+            donatedAmount = Float.parseFloat(amount);
+            if (donatedAmount <= 0) {
+                return String.format("redirect:/post?postid=%d&error", postid);
+            }
+            post.setFundsNeeded(donatedAmount);
+        } catch (NumberFormatException e) {
+            return String.format("redirect:/post?postid=%d&error", postid);
+        }
+
+        FundsCollected funds = new FundsCollected("Online donation", donatedAmount);
         fundsCollectedService.save(funds);
 
@@ -230 +261 @@
         donationPostService.save(post);
 
-        DonationInformation donationInformation = new DonationInformation(amount, post.getId(), post.getTitle());
+        DonationInformation donationInformation = new DonationInformation(donatedAmount, post.getId(), post.getTitle());
         donationInformationService.save(donationInformation);
         MainUser user = (MainUser) userService.loadUserByUsername(SecurityContextHolder.getContext().getAuthentication().getName());
@@ -239 +270 @@
     }
 
-    @RequestMapping("/report")
+    @RequestMapping(value="/report", method = RequestMethod.POST)
     public String report(@RequestParam Long postid,
                          @RequestParam String description) {

src/main/resources/templates/post.html

@@ -77 +77 @@
                 Report
             </button>
+            <div id="error" class="text-danger" hidden>Donation error</div>
 
             <!-- Modal -->
@@ -197 +198 @@
 </div>
 <script src="/js/bootstrap.min.js"></script>
+<script>
+    location.search
+        .substr(1)
+        .split("&")
+        .forEach(function (item) {
+            tmp = item.split("=");
+            if (tmp[0] === "error") {
+                document.getElementById("error").hidden = false;
+            }
+        });
+</script>
 <script th:inline="javascript" th:unless="${notFound}" sec:authorize="isAuthenticated()">
     /*<![CDATA[*/

src/main/resources/templates/reportPost.html

@@ -71 +71 @@
 
                 <div th:if="${report}">
-                    <a class="btn btn-success" th:href="@{/moderator/dismiss(postid=${post.id})}">Dismiss</a>
+                    <a class="btn btn-success" th:href="@{/moderator/dismiss(postid=${post.id})}">Dismiss reports</a>
                     <button type="button" class="btn btn-danger" data-bs-toggle="modal"
                             data-bs-target="#staticBackdrop">

src/main/resources/templates/upload.html

@@ -16 +16 @@
 <br/>
 <div class="row">
+    <div th:if="${error}" class="text-danger">Error uploading post</div>
     <div class="col-md-4" id="left">
         <form th:action="@{/newPost}" method="post" id="myForm" enctype="multipart/form-data" class="row g-3">