From 83ad1f399924df53192e7f1630ce98f38de64b0f Mon Sep 17 00:00:00 2001
From: Hannes <hannes_huber@t-online.de>
Date: Mon, 25 May 2020 09:36:40 +0200
Subject: [PATCH] remove advertisementflag

---
 .../action/user/UpdateUserSettingsAction.java    |  6 ------
 .../hso/ecommerce/controller/UserController.java | 16 ----------------
 .../org/hso/ecommerce/entities/user/User.java    |  1 -
 .../main/resources/templates/user/settings.html  | 15 ---------------
 4 files changed, 38 deletions(-)

diff --git a/prototype/src/main/java/org/hso/ecommerce/action/user/UpdateUserSettingsAction.java b/prototype/src/main/java/org/hso/ecommerce/action/user/UpdateUserSettingsAction.java
index fe4805a..5732a7f 100644
--- a/prototype/src/main/java/org/hso/ecommerce/action/user/UpdateUserSettingsAction.java
+++ b/prototype/src/main/java/org/hso/ecommerce/action/user/UpdateUserSettingsAction.java
@@ -53,12 +53,6 @@ public class UpdateUserSettingsAction {
         return new UpdateResult(true);
     }
 
-    public UpdateResult updateAdvertisementFlag(boolean advertisementFlag){
-        this.user.isAdvertisementActivated = advertisementFlag;
-        this.repository.save(this.user);
-        return new UpdateResult(true);
-    }
-
     public UpdateResult updatePaymentInfo(String creditCardNumber){
         UpdateResult result = new UpdateResult(false);
         if(creditCardNumber.matches("[0-9]+")){
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java b/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
index 803dbf9..5b0c50b 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java
@@ -107,22 +107,6 @@ public class UserController {
         return "user/settings";
     }
 
-    @PostMapping("/settings/changeAdSettings")
-    public String changeAdSettings(HttpSession session,
-                                   @RequestParam("ad") String ad,
-                                   HttpServletRequest request
-    ) {
-        User user = userRepository.findById((long) session.getAttribute("userId")).get();
-
-        UpdateUserSettingsAction cusa = new UpdateUserSettingsAction(user, userRepository);
-        UpdateUserSettingsAction.UpdateResult result = cusa.updateAdvertisementFlag(ad.equals("y"));
-        if (result.updated == false) {
-            request.setAttribute("error", result.errorString);
-        }
-
-        return "user/settings";
-    }
-
     @PostMapping("/settings/changePaymentInfo")
     public String changePaymentInfo(HttpSession session,
                                     @RequestParam("creditCardNumber") String creditCardNumber,
diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java b/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java
index 40196c7..61a4503 100644
--- a/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java
+++ b/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java
@@ -33,7 +33,6 @@ public class User {
 
     public boolean isActive;
     public boolean isEmployee;
-    public boolean isAdvertisementActivated;
 
     @Embedded
     public Address defaultDeliveryAddress;
diff --git a/prototype/src/main/resources/templates/user/settings.html b/prototype/src/main/resources/templates/user/settings.html
index 89e81fb..86f25e3 100644
--- a/prototype/src/main/resources/templates/user/settings.html
+++ b/prototype/src/main/resources/templates/user/settings.html
@@ -91,21 +91,6 @@
             </div>
         </form>
 
-        <form class="detailflex" method="POST" th:action="@{/user/settings/changeAdSettings}">
-            <div>
-                <h2> Werbung </h2>
-            </div>
-            <div>
-                <fieldset>
-                    <input type="radio" name="ad" value="y" id="ad-y" required th:checked="${user.isAdvertisementActivated}">
-                    <label for="type-priv">Ich möchte Werbung erhalten.</label> <br/>
-                    <input type="radio" name="ad" value="n" id="ad-n" required th:checked="${!user.isAdvertisementActivated}">
-                    <label for="type-bus">Ich möchte keine Werbung erhalten.</label> <br/>
-                </fieldset>
-                <button type="submit"> Speichern</button>
-            </div>
-        </form>
-
         <form class="detailflex" method="POST" th:action="@{/user/settings/changePaymentInfo}">
             <div>
                 <h2> Zahlungsinformation</h2>