Changeset 27adfc8 for src/main

Timestamp:

02/04/23 18:48:07 (23 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

6032d44

Parents:

adf250d

Message:

register method

Location:

src/main/java/com/example/moviezone

Files:

• model/Customer.java (modified) (1 diff)
• model/User.java (modified) (1 diff)
• model/Worker.java (modified) (2 diffs)
• service/Impl/UserServiceImpl.java (modified) (3 diffs)
• service/UserService.java (modified) (1 diff)

src/main/java/com/example/moviezone/model/Customer.java

@@ -25 +25 @@
     Integer points;
 
+//    public Customer(String password, String first_name, String last_name, String address, String contact_number, String username) {
+//        super(password, first_name, last_name, address, contact_number, username);
+//    }
+
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        return Collections.singletonList(Role.ROLE_ADMIN);
+        return Collections.singletonList(Role.ROLE_USER);
     }
 

src/main/java/com/example/moviezone/model/User.java

@@ -45 +45 @@
     }
 
+    public User(String password, String first_name, String last_name, String address, String contact_number, String username) {
+        this.password = password;
+        this.first_name = first_name;
+        this.last_name = last_name;
+        this.address = address;
+        this.contact_number = contact_number;
+        this.username = username;
+        this.date_created=LocalDate.now();
+    }
+
     public User() {
 

src/main/java/com/example/moviezone/model/Worker.java

@@ -7 +7 @@
 import org.springframework.security.core.GrantedAuthority;
 
+import java.time.LocalDate;
 import java.util.Collection;
 import java.util.Collections;
@@ -26 +27 @@
     @JoinColumn(name = "id_cinema")
     Cinema cinema;
+
+//    public Worker(String password, String first_name, String last_name, String address, String contact_number, String username) {
+//        super(password, first_name, last_name, address, contact_number, username);
+//    }
+
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {

src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java

@@ -1 +1 @@
 package com.example.moviezone.service.Impl;
 
+import com.example.moviezone.model.Customer;
 import com.example.moviezone.model.User;
+import com.example.moviezone.model.Worker;
 import com.example.moviezone.model.exceptions.UserNotFoundException;
 import com.example.moviezone.repository.UserRepository;
 import com.example.moviezone.service.UserService;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -13 +16 @@
 
     private final UserRepository userRepository;
+    private final PasswordEncoder passwordEncoder;
 
-    public UserServiceImpl(UserRepository userRepository) {
+    public UserServiceImpl(UserRepository userRepository, PasswordEncoder passwordEncoder) {
         this.userRepository = userRepository;
+        this.passwordEncoder = passwordEncoder;
     }
 
@@ -33 +38 @@
     }
 
+//    @Override
+//    public User register(String first_name, String last_name, String username, String email, String number, String password, String role) {
+//        if(role.equals("worker"))
+//        {
+//            return userRepository.save(new Worker(passwordEncoder.encode(password),first_name,last_name,username,email,number));
+//        }
+//        else if (role.equals("user"))
+//            return userRepository.save(new Customer(passwordEncoder.encode(password),first_name,last_name,username,email,number));
+//    }
+
 
 }

src/main/java/com/example/moviezone/service/UserService.java

@@ -9 +9 @@
     User findById(Integer user_id);
     User findByUsername(String username);
+
+//    User register(String first_name, String last_name,String username, String email, String number, String password, String role);
+
 }