Changeset 97fbc67 for sources/app/src/main/java/parkup/configs

Timestamp:

11/11/21 11:55:43 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

2ace8f0

Parents:

3a58bd6

Message:

fixed deleteVraboten and deleteRegistriranParkirac

Location:

sources/app/src/main/java/parkup/configs

Files:

• RegistrationController.java (deleted)
• RegistrationRequest.java (modified) (2 diffs)
• RegistrationServiceRP.java (added)
• RegistrationServiceW.java (moved) (moved from sources/app/src/main/java/parkup/configs/RegistrationService.java ) (6 diffs)
• WebSecurityConfig.java (modified) (1 diff)
• token/ConfirmationTokenRP.java (added)
• token/ConfirmationTokenRepositoryRP.java (added)
• token/ConfirmationTokenRepositoryW.java (moved) (moved from sources/app/src/main/java/parkup/configs/token/ConfirmationTokenRepository.java ) (1 diff)
• token/ConfirmationTokenService.java (modified) (1 diff)
• token/ConfirmationTokenW.java (moved) (moved from sources/app/src/main/java/parkup/configs/token/ConfirmationToken.java ) (4 diffs)

sources/app/src/main/java/parkup/configs/RegistrationRequest.java

@@ -6 +6 @@
     private final String email;
     private final String password;
+    private final String mobile;
 
-    public RegistrationRequest(String firstName, String lastName, String email, String password) {
+    public RegistrationRequest(String firstName, String lastName, String email, String password, String mobile) {
         this.firstName = firstName;
         this.lastName = lastName;
         this.email = email;
         this.password = password;
+        this.mobile = mobile;
     }
 
@@ -30 +32 @@
     }
 
+    public String getMobile(){
+        return mobile;
+    }
+
 }

sources/app/src/main/java/parkup/configs/RegistrationServiceW.java

@@ -5 +5 @@
 import parkup.configs.email.EmailSender;
 import parkup.configs.email.EmailValidator;
-import parkup.configs.token.ConfirmationToken;
+import parkup.configs.token.ConfirmationTokenW;
 import parkup.configs.token.ConfirmationTokenService;
-import parkup.entities.Administrator;
-import parkup.services.AdministratorService;
+import parkup.entities.Vraboten;
+import parkup.services.VrabotenService;
 
 import javax.transaction.Transactional;
@@ -14 +14 @@
 
 @Service
-public class RegistrationService {
-    private final AdministratorService administratorService;
+public class RegistrationServiceW {
+    private final VrabotenService vrabotenService;
     private final EmailValidator emailValidator;
     private final ConfirmationTokenService confirmationTokenService;
@@ -21 +21 @@
 
     @Autowired
-    public RegistrationService(AdministratorService administratorService, EmailValidator emailValidator,
-                               ConfirmationTokenService confirmationTokenService, EmailSender emailSender) {
-        this.administratorService = administratorService;
+    public RegistrationServiceW(VrabotenService vrabotenService, EmailValidator emailValidator,
+                                 ConfirmationTokenService confirmationTokenService, EmailSender emailSender) {
+        this.vrabotenService = vrabotenService;
         this.emailValidator = emailValidator;
         this.confirmationTokenService = confirmationTokenService;
@@ -37 +37 @@
         }
 
-        String token = administratorService.signUpAdministrator(
-                new Administrator(
+        String token = vrabotenService.signUpVraboten(
+                new Vraboten(
                         request.getFirstName(),
                         request.getLastName(),
                         request.getEmail(),
-                        request.getPassword()
+                        request.getPassword(),
+                        request.getMobile()
                 )
         );
 
-        String link = "http://localhost:8080/administrator/registration/confirm?token=" + token;
+        String link = "http://localhost:8080/vraboten/registration/confirm?token=" + token;
         emailSender.send(
                 request.getEmail(),
@@ -56 +57 @@
     @Transactional
     public String confirmToken(String token) {
-        ConfirmationToken confirmationToken = confirmationTokenService
-                .getToken(token)
+        ConfirmationTokenW confirmationTokenW = confirmationTokenService
+                .getTokenW(token)
                 .orElseThrow(() ->
                         new IllegalStateException("token not found"));
 
-        if (confirmationToken.getConfirmedAt() != null) {
+        if (confirmationTokenW.getConfirmedAt() != null) {
             throw new IllegalStateException("email already confirmed");
         }
 
-        LocalDateTime expiredAt = confirmationToken.getExpiresAt();
+        LocalDateTime expiredAt = confirmationTokenW.getExpiresAt();
 
         if (expiredAt.isBefore(LocalDateTime.now())) {
@@ -71 +72 @@
         }
 
-        confirmationTokenService.setConfirmedAt(token);
+        confirmationTokenService.setConfirmedAtW(token);
 
-        administratorService.enableAdministrator(confirmationToken.getAdministrator().getEmail());
+        vrabotenService.enableVraboten(confirmationTokenW.getRegistriranParkirac().getEmail());
         return "confirmed";
     }

sources/app/src/main/java/parkup/configs/WebSecurityConfig.java

@@ -9 +9 @@
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import parkup.services.AdministratorService;
+import parkup.services.RegistriranParkiracService;
+import parkup.services.VrabotenService;
 
+@EnableWebSecurity
 @Configuration
-@EnableWebSecurity
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+        private final VrabotenService vrabotenService;
+        private final BCryptPasswordEncoder bCryptPasswordEncoder;
+        private final RegistriranParkiracService registriranParkiracService;
 
-    private final AdministratorService administratorService;
-    private final BCryptPasswordEncoder bCryptPasswordEncoder;
+        public WebSecurityConfig(VrabotenService vrabotenService, BCryptPasswordEncoder bCryptPasswordEncoder, RegistriranParkiracService registriranParkiracService) {
+            this.vrabotenService = vrabotenService;
+            this.bCryptPasswordEncoder = bCryptPasswordEncoder;
+            this.registriranParkiracService = registriranParkiracService;
+        }
 
-    public WebSecurityConfig(AdministratorService administratorService, BCryptPasswordEncoder bCryptPasswordEncoder) {
-        this.bCryptPasswordEncoder = bCryptPasswordEncoder;
-        this.administratorService = administratorService;
+        @Override
+        protected void configure(HttpSecurity http) throws Exception {
+            http
+                    .csrf().disable()
+                    .authorizeRequests()
+                        .antMatchers("/vraboten/registration/**")
+                        .permitAll()
+                        .antMatchers("/registriranParkirac/registration/**")
+                        .permitAll()
+                    .anyRequest()
+                    .authenticated().and().formLogin();
+        }
+
+        @Override
+        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+            auth.authenticationProvider(daoAuthenticationProviderW());
+            auth.authenticationProvider(daoAuthenticationProviderRP());
+        }
+
+        @Bean
+        public DaoAuthenticationProvider daoAuthenticationProviderW() {
+            DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+            provider.setPasswordEncoder(bCryptPasswordEncoder);
+            provider.setUserDetailsService(vrabotenService);
+            return provider;
+        }
+
+        @Bean
+        public DaoAuthenticationProvider daoAuthenticationProviderRP(){
+            DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+            provider.setPasswordEncoder(bCryptPasswordEncoder);
+            provider.setUserDetailsService(registriranParkiracService);
+            return provider;
+        }
+
     }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-                .csrf().disable()
-                .authorizeRequests()
-                    .antMatchers("/administrator/registration/**")
-                    .permitAll()
-                .anyRequest()
-                .authenticated().and()
-                .formLogin();
-    }
-
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.authenticationProvider(daoAuthenticationProvider());
-    }
-
-    @Bean
-    public DaoAuthenticationProvider daoAuthenticationProvider(){
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setPasswordEncoder(bCryptPasswordEncoder);
-        provider.setUserDetailsService(administratorService);
-        return provider;
-    }
-}

sources/app/src/main/java/parkup/configs/token/ConfirmationTokenRepositoryW.java

@@ -11 +11 @@
 
 @Repository
-public interface ConfirmationTokenRepository extends JpaRepository<ConfirmationToken,Integer> {
+public interface ConfirmationTokenRepositoryW extends JpaRepository<ConfirmationTokenW,Integer> {
 
-    Optional<ConfirmationToken> findByToken(String token);
+    Optional<ConfirmationTokenW> findByToken(String token);
+
+    void deleteByVraboten_VrabotenId(int vraboten_id);
 
     @Transactional
     @Modifying
-    @Query("UPDATE ConfirmationToken c " +
+    @Query("UPDATE ConfirmationTokenW c " +
             "SET c.confirmedAt = ?2 " +
             "WHERE c.token = ?1")

sources/app/src/main/java/parkup/configs/token/ConfirmationTokenService.java

@@ -9 +9 @@
 public class ConfirmationTokenService {
 
-    private final ConfirmationTokenRepository confirmationTokenRepository;
+    private final ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP;
+    private final ConfirmationTokenRepositoryW confirmationTokenRepositoryW;
 
-    public ConfirmationTokenService(ConfirmationTokenRepository confirmationTokenRepository) {
-        this.confirmationTokenRepository = confirmationTokenRepository;
+    public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW, parkup.configs.token.ConfirmationTokenRepositoryW confirmationTokenRepositoryW1) {
+        this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP;
+        this.confirmationTokenRepositoryW = confirmationTokenRepositoryW1;
     }
 
-    public void saveConfirmationToken(ConfirmationToken token){
-        confirmationTokenRepository.save(token);
+    public void saveConfirmationTokenRP(ConfirmationTokenRP token){
+        confirmationTokenRepositoryRP.save(token);
     }
 
-    public Optional<ConfirmationToken> getToken(String token) {
-        return confirmationTokenRepository.findByToken(token);
+    public void saveConfirmationTokenW(ConfirmationTokenW token){
+        confirmationTokenRepositoryW.save(token);}
+
+    public Optional<ConfirmationTokenRP> getTokenRP(String token) {
+        return confirmationTokenRepositoryRP.findByToken(token);
+    }
+    public Optional<ConfirmationTokenW> getTokenW(String token){
+        return confirmationTokenRepositoryW.findByToken(token);
     }
 
-    public int setConfirmedAt(String token) {
-        return confirmationTokenRepository.updateConfirmedAt(token, LocalDateTime.now());
+    public void deleteByVraboten_VrabotenId(int vraboten_id){
+        confirmationTokenRepositoryW.deleteByVraboten_VrabotenId(vraboten_id);
+    }
+
+    public void deleteByRegistriranParkirac_RegParkId(int regParkId){
+        confirmationTokenRepositoryRP.deleteByRegistriranParkirac_RegParkId(regParkId);
+    }
+
+    public int setConfirmedAtRP(String token) {
+        return confirmationTokenRepositoryRP.updateConfirmedAt(token, LocalDateTime.now());
+    }
+    public int setConfirmedAtW(String token){
+        return confirmationTokenRepositoryW.updateConfirmedAt(token,LocalDateTime.now());
     }
 }

sources/app/src/main/java/parkup/configs/token/ConfirmationTokenW.java

@@ -1 +1 @@
 package parkup.configs.token;
 
-import parkup.entities.Administrator;
+import parkup.entities.Vraboten;
 
 import javax.persistence.*;
@@ -7 +7 @@
 
 @Entity
-public class ConfirmationToken {
+public class ConfirmationTokenW {
 
     @Id
     @Column(name = "confirmation_token_id")
     @SequenceGenerator(
-            name="confirmation_token_generator",
-            sequenceName = "confirmation_token_sequence",
+            name="confirmation_token_sequence_generator_W",
+            sequenceName = "confirmation_token_sequence_W",
             allocationSize = 1,
-            initialValue = 900
+            initialValue = 1200
     )
     @GeneratedValue(    //za postgres treba sequence da se namesti i ime na generator mi ga davamo kako od gore sto e
             strategy = GenerationType.SEQUENCE,
-            generator = "confirmation_token_sequence_generator"
+            generator = "confirmation_token_sequence_generator_W"
     )
     private int id;
@@ -34 +34 @@
     private LocalDateTime confirmedAt;
 
-    @ManyToOne
-    @JoinColumn(nullable = false, name = "administrator_id")
-    //many confirmation tokens to one administrator
-    private Administrator administrator;
+    @ManyToOne(cascade = {CascadeType.ALL})
+    @JoinColumn(nullable = false, name = "vraboten_id")
+    //many confirmation tokens to one registriranParkirac
+    private Vraboten vraboten;
 
-    public ConfirmationToken() {}
+    public ConfirmationTokenW() {}
 
-    public ConfirmationToken(int id, String token, LocalDateTime createdAt, LocalDateTime expiresAt, Administrator administrator) {
+    public ConfirmationTokenW(int id, String token, LocalDateTime createdAt, LocalDateTime expiresAt, Vraboten vraboten) {
         this.id = id;
         this.token = token;
         this.createdAt = createdAt;
         this.expiresAt = expiresAt;
-        this.administrator = administrator;
+        this.vraboten = vraboten;
     }
 
-    public ConfirmationToken(String token, LocalDateTime createdAt, LocalDateTime expiresAt, Administrator administrator) {
+    public ConfirmationTokenW(String token, LocalDateTime createdAt, LocalDateTime expiresAt, Vraboten vraboten) {
         this.token = token;
         this.createdAt = createdAt;
         this.expiresAt = expiresAt;
-        this.administrator = administrator;
+        this.vraboten = vraboten;
     }
 
@@ -96 +96 @@
     }
 
-    public Administrator getAdministrator() {
-        return administrator;
+    public Vraboten getRegistriranParkirac() {
+        return vraboten;
     }
 
-    public void setAdministrator(Administrator administrator) {
-        this.administrator = administrator;
+    public void setRegistriranParkirac(Vraboten vraboten) {
+        this.vraboten = vraboten;
     }
 }