Changeset 3753356

Timestamp:

02/12/22 14:32:43 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

2b65789

Parents:

0e407de

Message:

getPlates method added

Location:

sources/app/src/main/java/parkup

Files:

• controllers/RegisteredUserController.java (modified) (1 diff)
• entities/Guest.java (modified) (5 diffs)
• services/GuestService.java (modified) (3 diffs)
• services/RegisteredUserService.java (modified) (3 diffs)

sources/app/src/main/java/parkup/controllers/RegisteredUserController.java

@@ -61 +61 @@
         return this.registeredUserService.addTablica(regParkId,plate);
     }
-
+    @GetMapping({"/registiranParkirac/tablici"})
+    public List<String> getTabliciFromUser(){
+        return this.registeredUserService.getTablici();
+    }
     @DeleteMapping({"/registriranParkirac/{regParkId}/tablici"})
     public RegisteredUser deleteTablicaFromUser(@PathVariable int regParkId, @RequestBody Plate plate){

sources/app/src/main/java/parkup/entities/Guest.java

@@ -22 +22 @@
             initialValue = 400
     )
-    @GeneratedValue(    //za postgres treba sequence da se namesti i ime na generator mi ga davamo kako od gore sto e
+    @GeneratedValue(
             strategy = GenerationType.SEQUENCE,
             generator = "guest_sequence_generator"
@@ -29 +29 @@
     private int guestId;
 
-    //dali ova treba vaka?
     @OneToOne
     @JoinColumn(name = "tablickaId", nullable = false)
@@ -40 +39 @@
     private String mobile;
 
+    @Column(name = "password")
+    private String password;
+
     @OneToOne
     private ParkingSession session;
@@ -49 +51 @@
     public Guest() {this.role=UserRole.ROLE_USER;}
 
-    public Guest(int guestId, Plate plate, String email, String mobile) {
+    public Guest(int guestId, Plate plate,String password, String email, String mobile) {
         this.guestId = guestId;
         this.plate = plate;
         this.email = email;
+        this.password=password;
         this.mobile = mobile;
         this.role=UserRole.ROLE_USER;
@@ -118 +121 @@
     }
 
+    public Plate getPlate() {
+        return plate;
+    }
+
+    public void setPlate(Plate plate) {
+        this.plate = plate;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
     @Override
     public String getPassword() {

sources/app/src/main/java/parkup/services/GuestService.java

@@ -4 +4 @@
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import parkup.entities.Guest;
@@ -11 +12 @@
 public class GuestService {
     private final GuestRepository guestRepository;
+    private final BCryptPasswordEncoder passwordEncoder;
 
     @Autowired
-    public GuestService(GuestRepository guestRepository) {
+    public GuestService(GuestRepository guestRepository, BCryptPasswordEncoder passwordEncoder) {
         this.guestRepository = guestRepository;
+        this.passwordEncoder = passwordEncoder;
     }
 
@@ -31 +34 @@
             throw new IllegalStateException("Email already taken, try adding a guest with a different valid email address");
         } else {
-            System.out.println(guest);
+//            guest.setPassword(passwordEncoder.encode(Math.random()));
             this.guestRepository.save(guest);
         }

sources/app/src/main/java/parkup/services/RegisteredUserService.java

@@ -6 +6 @@
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import javax.transaction.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -14 +16 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
+import parkup.ParkUpApplication;
 import parkup.configs.email.EmailValidator;
 import parkup.configs.token.ConfirmationTokenRP;
@@ -163 +166 @@
         return user;
     }
+
+    public List<String> getTablici() {
+        Authentication role = ParkUpApplication.getToken();
+        return registeredUserRepository.findRegisteredUserByEmail(role.getName()).get().getPlates().stream().map(Plate::getPlate).collect(Collectors.toList());
+    }
 }