Changeset dfd5d87 for phonelux-backend/src/main/java/finki

Timestamp:

08/29/22 22:31:57 (2 years ago)

Author:

Marko <Marko@…>

Branches:

master

Children:

dbd4834

Parents:

b68ae8d

Message:

Registration logic with confirmation token implemented

Location:

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

Files:

• controllers/PhoneController.java (modified) (2 diffs)
• controllers/PhoneOfferController.java (added)
• controllers/RegistrationController.java (added)
• data/RegistrationRequest.java (added)
• data/UserRole.java (added)
• entities/ConfirmationToken.java (added)
• entities/Phone.java (modified) (1 diff)
• entities/PhoneOffer.java (modified) (1 diff)
• entities/User.java (added)
• repositories/ConfirmationTokenRepository.java (added)
• repositories/PhoneOfferRepository.java (added)
• repositories/UserRepository.java (added)
• security/PasswordEncoder.java (added)
• security/configs/WebSecurityConfig.java (added)
• security/email/EmailSender.java (added)
• security/email/EmailValidator.java (added)
• services/ConfirmationTokenService.java (added)
• services/EmailService.java (added)
• services/PhoneOfferService.java (added)
• services/PhoneService.java (modified) (1 diff)
• services/RegistrationService.java (added)
• services/UserService.java (added)

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

@@ -19 +19 @@
     }
 
+
+    // handle request parameters for filtering phones
     @GetMapping
     public List<Phone> getPhones(){
@@ -24 +26 @@
     }
 
-    @PostMapping(path = "{phoneId}")
-    public List<PhoneOffer> getOffersForPhone(@PathVariable("phoneId") Long phoneId){
-        return phoneService.getOffersForPhone(phoneId);
-    }
-
 }

phonelux-backend/src/main/java/finki/it/phoneluxbackend/entities/Phone.java

@@ -25 +25 @@
     private String model;
 
+    @Column(name = "image_url")
+    private String image_url;
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "phone")
     @JsonIgnore

phonelux-backend/src/main/java/finki/it/phoneluxbackend/entities/PhoneOffer.java

@@ -77 +77 @@
     @JsonIgnore
     private Phone phone;
+
+    public PhoneOffer(String offer_shop, String offer_name,
+                      Integer price, String ram_memory,
+                      String rom_memory, String color,
+                      String front_camera, String back_camera,
+                      String chipset, String battery,
+                      String operating_system, String cpu,
+                      String image_url, String offer_url,
+                      Date last_updated, Boolean is_validated,
+                      String offer_description, String offer_shop_code, Phone phone) {
+        this.offer_shop = offer_shop;
+        this.offer_name = offer_name;
+        this.price = price;
+        this.ram_memory = ram_memory;
+        this.rom_memory = rom_memory;
+        this.color = color;
+        this.front_camera = front_camera;
+        this.back_camera = back_camera;
+        this.chipset = chipset;
+        this.battery = battery;
+        this.operating_system = operating_system;
+        this.cpu = cpu;
+        this.image_url = image_url;
+        this.offer_url = offer_url;
+        this.last_updated = last_updated;
+        this.is_validated = is_validated;
+        this.offer_description = offer_description;
+        this.offer_shop_code = offer_shop_code;
+        this.phone = phone;
+    }
 }

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

@@ -21 +21 @@
     }
 
-    public List<PhoneOffer> getOffersForPhone(Long phoneId) {
-        boolean exists = phoneRepository.existsById(phoneId);
-        if(!exists)
-            throw new IllegalStateException("Phone with id "+phoneId+" does not exist");
-
-        return phoneRepository.findById(phoneId).get().getPhoneOffers();
-    }
 }