Changeset e5b84dc for phonelux-backend/src

Timestamp:

09/11/22 18:03:58 (22 months ago)

Author:

Marko <Marko@…>

Branches:

master

Children:

775e15e

Parents:

527b93f

Message:

Prototype version

Location:

phonelux-backend/src/main/java/finki/it/phoneluxbackend

Files:

• controllers/PhoneController.java (modified) (1 diff)
• controllers/PhoneOfferController.java (modified) (1 diff)
• security/CustomAuthenticationFilter.java (modified) (2 diffs)
• services/PhoneOfferService.java (modified) (1 diff)
• services/PhoneService.java (modified) (2 diffs)
• services/UserService.java (modified) (1 diff)

phonelux-backend/src/main/java/finki/it/phoneluxbackend/controllers/PhoneController.java

@@ -22 +22 @@
 //     handle request parameters for filtering phones
     @GetMapping(path = "/phones")
-    public List<Phone> getPhones(){
-        return phoneService.getPhones().stream()
-                .sorted(Comparator.comparing(Phone::getTotal_offers).reversed())
-                .collect(Collectors.toList());
+    public List<Phone> getPhones(@RequestParam(name = "shops", required = false) String shops,
+                                 @RequestParam(name = "brands", required = false) String brands,
+                                 @RequestParam(name = "sortBy", required = false) String sortBy,
+                                 @RequestParam(name = "priceRange", required = false) String priceRange,
+                                 @RequestParam(name = "searchValue", required = false) String searchValue){
+
+        return phoneService.getPhones(shops,brands,sortBy,priceRange,searchValue);
     }
 

phonelux-backend/src/main/java/finki/it/phoneluxbackend/controllers/PhoneOfferController.java

@@ -16 +16 @@
 @RestController
 @AllArgsConstructor
-@RequestMapping(path = "/phones/offers/{phoneId}")
 public class PhoneOfferController {
     private final PhoneOfferService phoneOfferService;
     private final PhoneService phoneService;
 
-    @GetMapping
+    @GetMapping(path = "/phones/offers/{phoneId}")
     public List<PhoneOffer> getOffersForPhone(@PathVariable("phoneId") Long phoneId){
         return phoneOfferService.getPhoneOffersForPhone(phoneId);
     }
 
+    @GetMapping(path = "/phoneoffer/{offerId}")
+    public PhoneOffer getPhoneOffer(@PathVariable("offerId") Long offerId){
+        return phoneOfferService.getPhoneOffer(offerId);
+    }
+
 }

phonelux-backend/src/main/java/finki/it/phoneluxbackend/security/CustomAuthenticationFilter.java

@@ -33 +33 @@
     @Override
     public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
-        String email = request.getParameter("email"); // mozda ke treba da se smeni vo username
+        String email = request.getParameter("email");
         String password = request.getParameter("password");
         UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(email,password);
@@ -46 +46 @@
         String access_token = JWT.create()
                 .withSubject(user.getEmail())
-                .withExpiresAt(new Date(System.currentTimeMillis() + 10 * 60 * 1000))
+                .withExpiresAt(new Date(System.currentTimeMillis() + 10 * 60 * 100000)) // approx. 16.5 hours
                 .withIssuer(request.getRequestURL().toString())
                 .withClaim("role", user.getAuthorities().stream()

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/PhoneOfferService.java

@@ -30 +30 @@
     }
 
+    public PhoneOffer getPhoneOffer(Long offerId){
+        boolean exists = phoneOfferRepository.existsById(offerId);
+
+        if(!exists)
+            throw new IllegalStateException("Phone offer with id "+offerId+" does not exist");
+
+        return phoneOfferRepository.findById(offerId).get();
+    }
+
+
     public List<String> getShops() {
         return phoneOfferRepository.findAll().stream()

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/PhoneService.java

@@ -10 +10 @@
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -22 +23 @@
 
     // TODO: insert logic to filter
-    public List<Phone> getPhones(){
-        return phoneRepository.findAll();
+    public List<Phone> getPhones(String shops, String brands, String sortBy, String priceRange, String searchValue){
+        List<Phone> phones = phoneRepository.findAll();
+
+
+        if(brands != null)
+        {
+            phones = phones.stream()
+                    .filter(phone -> brands.contains(phone.getBrand())).collect(Collectors.toList());
+        }
+
+        if(shops != null)
+        {
+            phones = phones.stream()
+                    .filter(phone -> phone.getPhoneOffers().stream().anyMatch(offer -> shops.contains(offer.getOffer_shop())))
+                    .collect(Collectors.toList());
+        }
+
+        if(priceRange != null)
+        {
+            int lowestPrice = Integer.parseInt(priceRange.split("-")[0]);
+            int highestPrice = Integer.parseInt(priceRange.split("-")[1]);
+            phones = phones.stream()
+                    .filter(phone -> phone.getLowestPrice() >= lowestPrice && phone.getLowestPrice() <= highestPrice)
+                    .collect(Collectors.toList());
+        }
+
+        if(searchValue != null && !Objects.equals(searchValue.stripIndent(), "")){
+            phones = phones.stream()
+                    .filter(phone -> phone.getBrand().toLowerCase().contains(searchValue.stripIndent().toLowerCase())
+                            || phone.getModel().toLowerCase().contains(searchValue.stripIndent().toLowerCase()))
+                    .collect(Collectors.toList());
+        }
+
+        phones = phones.stream().sorted(Comparator.comparing(Phone::getTotal_offers).reversed())
+                .collect(Collectors.toList());
+        if(sortBy != null)
+        {
+            if(sortBy.equals("ascending")) {
+                phones = phones.stream()
+                        .sorted(Comparator.comparing(Phone::getLowestPrice))
+                        .collect(Collectors.toList());
+            }
+
+            if(sortBy.equals("descending")) {
+                phones = phones.stream()
+                        .sorted(Comparator.comparing(Phone::getLowestPrice).reversed())
+                        .collect(Collectors.toList());
+            }
+        }
+
+        return phones;
     }
 

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/UserService.java

@@ -40 +40 @@
            User userToRegister =  userRepository.findByEmail(user.getEmail()).get();
            if(userToRegister.getEnabled()) {
-               return ResponseEntity.badRequest().body("Error: Email "+user.getEmail()+" already taken!");
+               return ResponseEntity.badRequest().body("Error:Е-маил адресата е веќе зафатена!");
            }
            else {
-               return ResponseEntity.badRequest().body("Email "+user.getEmail()+" not activated!" );
+               return ResponseEntity.badRequest().body("Error:Профилот не е активиран. Потврдете на вашата е-маил адреса!" );
            }
        }