Merge branch 'issueThirtyFour' into 'develop'

Issue thirty four

See merge request !94

src/main/java/com/example/clientproject/data/shops/Shops.java

@@ -34,6 +34,7 @@ public class Shops {
     private String shopWebsite;
     private int shopEarnings;
     private String shopImage;
+    private String shopBanner;
     private String shopCountries;
 
     @Convert(converter = TinyIntToBoolean.class)
@@ -49,13 +50,14 @@ public class Shops {
      * @param active - shop active status
      */
     public Shops(String name, String website, String description, int earnings,
-                 String image, String countries, boolean active, StampBoards stampBoard,
+                 String image, String banner, String countries, boolean active, StampBoards stampBoard,
                  Categories categories) {
         this.shopName = name;
         this.shopDescription = description;
         this.shopWebsite = website;
         this.shopEarnings = earnings;
         this.shopImage = image;
+        this.shopBanner = banner;
         this.shopCountries = countries;
         this.shopActive = active;
         this.stampBoard = stampBoard;

src/main/java/com/example/clientproject/data/tags/TagsRepo.java

@@ -24,4 +24,7 @@ public interface TagsRepo extends JpaRepository<Tags, Long> {
 
     @Query("select t from Tags t where t.tagName = ?1")
     Optional<Tags> findByTagName(String tagName);
+
+    @Query("select t from Tags t where t.tagName = ?1")
+    Optional<Tags> findByTagNameIgnoreCase(String tagName);
 }

src/main/java/com/example/clientproject/services/BusinessRegisterSaver.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 @Service
 public class BusinessRegisterSaver {
@@ -71,6 +72,7 @@ public class BusinessRegisterSaver {
                 business.getBusiness_register_desc(),
                 business.getEarnings(),
                 "shopPic.png",
+                "shopBanner.png",
                 "UK United Kingdom",
                 false,
                 stampBoard,
@@ -81,17 +83,24 @@ public class BusinessRegisterSaver {
         //System.out.println(shop.getStampBoard());
 
         shopsRepo.save(shop);
-        List<Tags> tagsList = tagsRepo.findAll();
+        List<String> tagsList = new ArrayList<>();
+        List<String> tagsLowerList = new ArrayList<>();
+        tagsRepo.findAll().forEach(x -> tagsList.add(x.getTagName()));
+        tagsRepo.findAll().forEach(x -> tagsLowerList.add(x.getTagName().toLowerCase()));
+
+        System.out.println(tagsLowerList);
+        business.getBusinessTags().forEach(x-> System.out.println(x));
 
         linkShop.linkUserShop(shop.getShopId(), userId, 2L);
 
         for(String t: business.getBusinessTags()){
-            if(tagsList.contains(new Tags(t))){
-                continue;
+            Tags tag;
+            if(tagsLowerList.contains(t.toLowerCase())){
+                tag = tagsRepo.findByTagNameIgnoreCase(t).get();
+            }else{
+                tag = new Tags(t);
+                tagsRepo.save(tag);
             }
-            //long id = 0;
-            Tags tag = new Tags(t);
-            tagsRepo.save(tag);
 
 
             query = "INSERT INTO Shop_Tag_Links (Shop_Id, Tag_Id) VALUES ("+ shop.getShopId() +

src/main/java/com/example/clientproject/services/KeyInfoDTO.java

+package com.example.clientproject.services;
+
+import com.example.clientproject.web.forms.UpdateKeyInfoForm;
+import lombok.AllArgsConstructor;
+import lombok.Value;
+
+@Value
+@AllArgsConstructor
+public class KeyInfoDTO {
+    int shopId;
+    String shopName;
+    String shopDescription;
+    String bannerName;
+    String logoName;
+
+    public KeyInfoDTO(UpdateKeyInfoForm form){
+        this(
+          form.getShopId(),
+          form.getShopName(),
+          form.getShopDescription(),
+          form.getBannerName(),
+          form.getLogoName()
+        );
+    }
+}

src/main/java/com/example/clientproject/services/UpdateKeyInfo.java

+package com.example.clientproject.services;
+
+import com.example.clientproject.data.shops.Shops;
+import com.example.clientproject.data.shops.ShopsRepo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UpdateKeyInfo {
+
+    @Autowired
+    ShopsRepo shopsRepo;
+
+    public void updateInfo(KeyInfoDTO kiDTO){
+        Shops shop = shopsRepo.getById((long) kiDTO.getShopId());
+
+        shop.setShopName(kiDTO.getShopName());
+        shop.setShopDescription(kiDTO.getShopDescription());
+
+        if(!kiDTO.getBannerName().equalsIgnoreCase("")){
+            shop.setShopBanner(kiDTO.getBannerName());
+        }
+        if(!kiDTO.getLogoName().equalsIgnoreCase("")){
+            shop.setShopImage(kiDTO.getLogoName());
+        }
+
+        shopsRepo.save(shop);
+    }
+
+}

src/main/java/com/example/clientproject/web/forms/UpdateKeyInfoForm.java

+package com.example.clientproject.web.forms;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UpdateKeyInfoForm {
+    private int shopId;
+    private String shopName;
+    private String shopDescription;
+    private String bannerName;
+    private String logoName;
+}

src/main/java/com/example/clientproject/web/restControllers/UpdateKeyInformation.java

+package com.example.clientproject.web.restControllers;
+
+import com.example.clientproject.service.Utils.JWTUtils;
+import com.example.clientproject.services.KeyInfoDTO;
+import com.example.clientproject.services.UpdateKeyInfo;
+import com.example.clientproject.web.forms.UpdateKeyInfoForm;
+import org.hibernate.sql.Update;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+@RestController
+public class UpdateKeyInformation {
+
+    private JWTUtils jwtUtils;
+    private UpdateKeyInfo updateInfo;
+
+    public UpdateKeyInformation(JWTUtils utils, UpdateKeyInfo update){
+        jwtUtils = utils;
+        updateInfo = update;
+    }
+
+
+    @PostMapping("/updateKeyInformation")
+    public String updateInfo(HttpSession session, UpdateKeyInfoForm keyInformationForm){
+        if(!jwtUtils.getLoggedInUserId(session).isPresent()){
+            return "BAD SESSION";
+        }
+        try{
+            updateInfo.updateInfo(new KeyInfoDTO(keyInformationForm));
+            return "OK";
+        }catch (Exception e){
+            e.printStackTrace();
+            return "ERROR";
+        }
+
+
+    }
+}