Changeset 3753356 for sources/app/src/main/java/parkup
- Timestamp:
- 02/12/22 14:32:43 (3 years ago)
- Branches:
- master
- Children:
- 2b65789
- Parents:
- 0e407de
- Location:
- sources/app/src/main/java/parkup
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/controllers/RegisteredUserController.java
r0e407de r3753356 61 61 return this.registeredUserService.addTablica(regParkId,plate); 62 62 } 63 63 @GetMapping({"/registiranParkirac/tablici"}) 64 public List<String> getTabliciFromUser(){ 65 return this.registeredUserService.getTablici(); 66 } 64 67 @DeleteMapping({"/registriranParkirac/{regParkId}/tablici"}) 65 68 public RegisteredUser deleteTablicaFromUser(@PathVariable int regParkId, @RequestBody Plate plate){ -
sources/app/src/main/java/parkup/entities/Guest.java
r0e407de r3753356 22 22 initialValue = 400 23 23 ) 24 @GeneratedValue( //za postgres treba sequence da se namesti i ime na generator mi ga davamo kako od gore sto e24 @GeneratedValue( 25 25 strategy = GenerationType.SEQUENCE, 26 26 generator = "guest_sequence_generator" … … 29 29 private int guestId; 30 30 31 //dali ova treba vaka?32 31 @OneToOne 33 32 @JoinColumn(name = "tablickaId", nullable = false) … … 40 39 private String mobile; 41 40 41 @Column(name = "password") 42 private String password; 43 42 44 @OneToOne 43 45 private ParkingSession session; … … 49 51 public Guest() {this.role=UserRole.ROLE_USER;} 50 52 51 public Guest(int guestId, Plate plate, String email, String mobile) {53 public Guest(int guestId, Plate plate,String password, String email, String mobile) { 52 54 this.guestId = guestId; 53 55 this.plate = plate; 54 56 this.email = email; 57 this.password=password; 55 58 this.mobile = mobile; 56 59 this.role=UserRole.ROLE_USER; … … 118 121 } 119 122 123 public Plate getPlate() { 124 return plate; 125 } 126 127 public void setPlate(Plate plate) { 128 this.plate = plate; 129 } 130 131 public void setPassword(String password) { 132 this.password = password; 133 } 134 120 135 @Override 121 136 public String getPassword() { -
sources/app/src/main/java/parkup/services/GuestService.java
r0e407de r3753356 4 4 import java.util.Optional; 5 5 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; 6 7 import org.springframework.stereotype.Service; 7 8 import parkup.entities.Guest; … … 11 12 public class GuestService { 12 13 private final GuestRepository guestRepository; 14 private final BCryptPasswordEncoder passwordEncoder; 13 15 14 16 @Autowired 15 public GuestService(GuestRepository guestRepository ) {17 public GuestService(GuestRepository guestRepository, BCryptPasswordEncoder passwordEncoder) { 16 18 this.guestRepository = guestRepository; 19 this.passwordEncoder = passwordEncoder; 17 20 } 18 21 … … 31 34 throw new IllegalStateException("Email already taken, try adding a guest with a different valid email address"); 32 35 } else { 33 System.out.println(guest);36 // guest.setPassword(passwordEncoder.encode(Math.random())); 34 37 this.guestRepository.save(guest); 35 38 } -
sources/app/src/main/java/parkup/services/RegisteredUserService.java
r0e407de r3753356 6 6 import java.util.Optional; 7 7 import java.util.UUID; 8 import java.util.stream.Collectors; 8 9 import javax.transaction.Transactional; 9 10 import org.springframework.beans.factory.annotation.Autowired; 10 11 import org.springframework.data.jpa.repository.Modifying; 12 import org.springframework.security.core.Authentication; 11 13 import org.springframework.security.core.userdetails.UserDetails; 12 14 import org.springframework.security.core.userdetails.UserDetailsService; … … 14 16 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; 15 17 import org.springframework.stereotype.Service; 18 import parkup.ParkUpApplication; 16 19 import parkup.configs.email.EmailValidator; 17 20 import parkup.configs.token.ConfirmationTokenRP; … … 163 166 return user; 164 167 } 168 169 public List<String> getTablici() { 170 Authentication role = ParkUpApplication.getToken(); 171 return registeredUserRepository.findRegisteredUserByEmail(role.getName()).get().getPlates().stream().map(Plate::getPlate).collect(Collectors.toList()); 172 } 165 173 }
Note:
See TracChangeset
for help on using the changeset viewer.