Ignore:
Timestamp:
04/29/25 17:41:54 (42 hours ago)
Author:
ivanov1332 <zareivanov070@…>
Branches:
master
Children:
b77dbe8
Parents:
7d8eeab
Message:

Fixed lombok,optimized DTOs

Location:
ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo
Files:
1 added
16 edited

Legend:

Unmodified
Added
Removed
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/config/WebSecurityConfig.java

    r7d8eeab r349551d  
    3838                        .frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin))
    3939                .authorizeHttpRequests((requests) -> requests
    40                         .requestMatchers(HttpMethod.OPTIONS,"/**").permitAll()
     40                        .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
    4141                        .requestMatchers(
    4242                                "/api/auth/**",
    4343                                "/h2/**",
    4444                                "/favicon.ico",
    45                                 "/api/locals/**")
     45                                "/api/locals/**",
     46                                "/uploads/**")
    4647                        .permitAll()
    4748                        .requestMatchers("/api/customer/**").hasRole("CUSTOMER")
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/dto/jwtDTO/JWTAuthenticationRequestDTO.java

    r7d8eeab r349551d  
    11package mk.ukim.finki.it.reservengo.dto.jwtDTO;
     2
     3import mk.ukim.finki.it.reservengo.model.domain.Customer;
     4import mk.ukim.finki.it.reservengo.model.domain.LocalManager;
     5import mk.ukim.finki.it.reservengo.model.domain.LocalWorker;
     6import mk.ukim.finki.it.reservengo.model.enumerations.Role;
    27
    38public record JWTAuthenticationRequestDTO(
     
    813        String phoneNumber
    914) {
     15
     16
     17    public Customer toCustomer(String encodedPassword) {
     18        return new Customer(
     19                firstName,
     20                lastName,
     21                email,
     22                encodedPassword,
     23                phoneNumber,
     24                Role.ROLE_CUSTOMER
     25        );
     26    }
     27
     28    public LocalWorker toLocalWorker(String encodedPassword) {
     29        return new LocalWorker(
     30                firstName,
     31                lastName,
     32                email,
     33                encodedPassword,
     34                phoneNumber,
     35                Role.ROLE_LOCAL_WORKER
     36        );
     37    }
     38
     39    public LocalManager toLocalManager(String encodedPassword) {
     40        return new LocalManager(
     41                firstName,
     42                lastName,
     43                email,
     44                encodedPassword,
     45                phoneNumber,
     46                Role.ROLE_LOCAL_MANAGER
     47        );
     48    }
    1049}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/dto/jwtDTO/JWTAuthenticationResponseDTO.java

    r7d8eeab r349551d  
    11package mk.ukim.finki.it.reservengo.dto.jwtDTO;
    22
    3 import mk.ukim.finki.it.reservengo.model.domain.JWTAuthentication;
     3import mk.ukim.finki.it.reservengo.model.domain.Customer;
     4import mk.ukim.finki.it.reservengo.model.domain.LocalManager;
     5import mk.ukim.finki.it.reservengo.model.domain.LocalWorker;
     6import mk.ukim.finki.it.reservengo.model.domain.User;
    47import mk.ukim.finki.it.reservengo.model.enumerations.Role;
    58
     
    1417        String token
    1518) {
    16     public static JWTAuthenticationResponseDTO from(JWTAuthentication jwtAuthentication) {
     19
     20    public static JWTAuthenticationResponseDTO toCustomer(Customer customer, String jwt) {
    1721        return new JWTAuthenticationResponseDTO(
    18                 jwtAuthentication.getId(),
    19                 jwtAuthentication.getFirstName(),
    20                 jwtAuthentication.getLastName(),
    21                 jwtAuthentication.getEmail(),
    22                 jwtAuthentication.getPhoneNumber(),
    23                 jwtAuthentication.getRole(),
    24                 jwtAuthentication.getToken()
     22                customer.getId(),
     23                customer.getFirstName(),
     24                customer.getLastName(),
     25                customer.getEmail(),
     26                customer.getPhoneNumber(),
     27                Role.ROLE_CUSTOMER,
     28                jwt
     29        );
     30    }
     31
     32    public static JWTAuthenticationResponseDTO toLocalWorker(LocalWorker localWorker, String jwt) {
     33        return new JWTAuthenticationResponseDTO(
     34                localWorker.getId(),
     35                localWorker.getFirstName(),
     36                localWorker.getLastName(),
     37                localWorker.getEmail(),
     38                localWorker.getPhoneNumber(),
     39                Role.ROLE_LOCAL_WORKER,
     40                jwt
     41        );
     42    }
     43
     44    public static JWTAuthenticationResponseDTO toLocalManager(LocalManager localManager, String jwt) {
     45        return new JWTAuthenticationResponseDTO(
     46                localManager.getId(),
     47                localManager.getFirstName(),
     48                localManager.getLastName(),
     49                localManager.getEmail(),
     50                localManager.getPhoneNumber(),
     51                Role.ROLE_LOCAL_MANAGER,
     52                jwt
     53        );
     54    }
     55
     56    public static JWTAuthenticationResponseDTO toUser(User user, String jwt) {
     57        return new JWTAuthenticationResponseDTO(
     58                user.getId(),
     59                user.getFirstName(),
     60                user.getLastName(),
     61                user.getEmail(),
     62                user.getPhoneNumber(),
     63                user.getUserRole(),
     64                jwt
    2565        );
    2666    }
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/Admin.java

    r7d8eeab r349551d  
    22
    33import jakarta.persistence.Entity;
     4import lombok.Data;
    45import lombok.EqualsAndHashCode;
     6import lombok.NoArgsConstructor;
    57import mk.ukim.finki.it.reservengo.model.enumerations.Role;
    68
    79@EqualsAndHashCode(callSuper = true)
    810@Entity
     11@NoArgsConstructor
     12@Data
    913public class Admin extends User {
    1014    public Admin(String email, String password, Role userRole) {
     
    1216    }
    1317
    14     public Admin() {
    15     }
    1618}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/Contact.java

    r7d8eeab r349551d  
    55import jakarta.persistence.Embeddable;
    66import jakarta.persistence.MapKeyColumn;
     7import lombok.AllArgsConstructor;
    78import lombok.Data;
    89import lombok.NoArgsConstructor;
     
    1112
    1213@Data
    13 //@AllArgsConstructor
     14@AllArgsConstructor
    1415@NoArgsConstructor
    1516@Embeddable
     
    1819    private String email;
    1920    @ElementCollection
    20     @MapKeyColumn(name = "soical_app_name")
     21    @MapKeyColumn(name = "social_app_name")
    2122    @Column(name = "social_app_link")
    2223    private Map<String, String> socialLinks;
    2324
    24     public Contact(String phone, String email, Map<String, String> socialLinks) {
    25         this.phone = phone;
    26         this.email = email;
    27         this.socialLinks = socialLinks;
    28     }
    29 
    30     public String getPhone() {
    31         return phone;
    32     }
    33 
    34     public void setPhone(String phone) {
    35         this.phone = phone;
    36     }
    37 
    38     public String getEmail() {
    39         return email;
    40     }
    41 
    42     public void setEmail(String email) {
    43         this.email = email;
    44     }
    45 
    46     public Map<String, String> getSocialLinks() {
    47         return socialLinks;
    48     }
    49 
    50     public void setSocialLinks(Map<String, String> socialLinks) {
    51         this.socialLinks = socialLinks;
    52     }
    5325}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/Customer.java

    r7d8eeab r349551d  
    22
    33import jakarta.persistence.*;
    4 import lombok.EqualsAndHashCode;
     4import lombok.*;
    55import mk.ukim.finki.it.reservengo.model.enumerations.Role;
    66
     
    99@EqualsAndHashCode(callSuper = true)
    1010@Entity
    11 
     11@NoArgsConstructor
     12@AllArgsConstructor
     13@Data
    1214public class Customer extends User {
    1315    public Customer(String firstName, String lastName, String email, String password, String phoneNumber, Role userRole) {
    1416        super(firstName, lastName, email, password, phoneNumber, userRole);
    15     }
    16 
    17     public Customer() {
    1817    }
    1918
     
    2423    private List<Local> favouriteLocals;
    2524
    26     public List<Reservation> getReservations() {
    27         return reservations;
    28     }
    29 
    30     public List<Local> getFavouriteLocals() {
    31         return favouriteLocals;
    32     }
    33 
    3425}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/Event.java

    r7d8eeab r349551d  
    22
    33import jakarta.persistence.*;
    4 import lombok.AllArgsConstructor;
    5 import lombok.Data;
    6 import lombok.NoArgsConstructor;
     4import lombok.*;
    75import mk.ukim.finki.it.reservengo.model.enumerations.EventStatus;
    86
     
    1412@NoArgsConstructor
    1513public class Event {
    16     public Event(String name, String description, LocalDateTime eventStart, LocalDateTime eventEnd, Local local, EventStatus status) {
    17         this.name = name;
    18         this.description = description;
    19         this.eventStart = eventStart;
    20         this.eventEnd = eventEnd;
    21         this.local = local;
    22         this.status = status;
    23     }
    2414
    2515    @Id
     
    4131    private EventStatus status;
    4232
    43     public Long getId() {
    44         return id;
    45     }
    46 
    47     public void setId(Long id) {
    48         this.id = id;
    49     }
    50 
    51     public String getName() {
    52         return name;
    53     }
    54 
    55     public void setName(String name) {
    56         this.name = name;
    57     }
    58 
    59     public String getDescription() {
    60         return description;
    61     }
    62 
    63     public void setDescription(String description) {
    64         this.description = description;
    65     }
    66 
    67     public LocalDateTime getEventStart() {
    68         return eventStart;
    69     }
    70 
    71     public void setEventStart(LocalDateTime eventStart) {
    72         this.eventStart = eventStart;
    73     }
    74 
    75     public LocalDateTime getEventEnd() {
    76         return eventEnd;
    77     }
    78 
    79     public void setEventEnd(LocalDateTime eventEnd) {
    80         this.eventEnd = eventEnd;
    81     }
    82 
    83     public Local getLocal() {
    84         return local;
    85     }
    86 
    87     public void setLocal(Local local) {
    88         this.local = local;
    89     }
    90 
    91     public EventStatus getStatus() {
    92         return status;
    93     }
    94 
    95     public void setStatus(EventStatus status) {
    96         this.status = status;
    97     }
    9833}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/JWTAuthentication.java

    r7d8eeab r349551d  
    11package mk.ukim.finki.it.reservengo.model.domain;
    22
     3import lombok.AllArgsConstructor;
     4import lombok.Data;
     5import lombok.NoArgsConstructor;
    36import mk.ukim.finki.it.reservengo.model.enumerations.Role;
    47
     8@Data
     9@AllArgsConstructor
     10@NoArgsConstructor
    511public class JWTAuthentication {
    6 
    712    private Long id;
    813    private String firstName;
     
    1419    private String token;
    1520
    16 
    17     public JWTAuthentication() {
    18     }
    19 
    20     public Long getId() {
    21         return id;
    22     }
    23 
    24     public String getFirstName() {
    25         return firstName;
    26     }
    27 
    28     public String getLastName() {
    29         return lastName;
    30     }
    31 
    32     public String getEmail() {
    33         return email;
    34     }
    35 
    36     public String getPhoneNumber() {
    37         return phoneNumber;
    38     }
    39 
    40     public Role getRole() {
    41         return role;
    42     }
    43 
    44     public String getToken() {
    45         return token;
    46     }
    47 
    48     public String getPassword() {
    49         return password;
    50     }
    51 
    52     public void setPassword(String password) {
    53         this.password = password;
    54     }
    5521}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/Local.java

    r7d8eeab r349551d  
    22
    33import jakarta.persistence.*;
     4import lombok.AllArgsConstructor;
     5import lombok.Data;
     6import lombok.NoArgsConstructor;
    47import mk.ukim.finki.it.reservengo.model.enumerations.Service;
    58
     
    1013@Entity
    1114@Table(name = "local_")
     15@Data
     16@AllArgsConstructor
     17@NoArgsConstructor
    1218public class Local {
    1319    public Local(String name, String description, String address, String workingHours, List<Service> availableServices, Map<Long, Integer> ratings, List<Event> events, List<String> localPhotos, String menuPhoto, String menuLink, Contact contact, List<Reservation> reservations, List<LocalWorker> workers) {
     
    3137    }
    3238
    33 
    34     public Local() {
    35     }
    3639
    3740    @Id
     
    6366    private String menuPhoto;
    6467
     68
    6569    private String menuLink;
    6670
     
    8791    }
    8892
    89 
    90     public Long getId() {
    91         return id;
    92     }
    93 
    94     public String getName() {
    95         return name;
    96     }
    97 
    98     public String getDescription() {
    99         return description;
    100     }
    101 
    102     public String getAddress() {
    103         return address;
    104     }
    105 
    106     public String getWorkingHours() {
    107         return workingHours;
    108     }
    109 
    110     public List<Service> getAvailableServices() {
    111         return availableServices;
    112     }
    113 
    114     public Map<Long, Integer> getRatings() {
    115         return ratings;
    116     }
    117 
    118     public List<Event> getEvents() {
    119         return events;
    120     }
    121 
    122     public List<String> getLocalPhotos() {
    123         return localPhotos;
    124     }
    125 
    126     public String getMenuPhoto() {
    127         return menuPhoto;
    128     }
    129 
    130     public String getMenuLink() {
    131         return menuLink;
    132     }
    133 
    134     public Contact getContact() {
    135         return contact;
    136     }
    137 
    138     public List<Reservation> getReservations() {
    139         return reservations;
    140     }
    141 
    142     public List<LocalWorker> getWorkers() {
    143         return workers;
    144     }
    145 
    146     public String getLogoUrl() {
    147         return logoUrl;
    148     }
    149 
    150     public void setLogoUrl(String logoUrl) {
    151         this.logoUrl = logoUrl;
    152     }
    15393}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/LocalManager.java

    r7d8eeab r349551d  
    22
    33import jakarta.persistence.Entity;
     4import lombok.Data;
    45import lombok.EqualsAndHashCode;
    5 import mk.ukim.finki.it.reservengo.model.enumerations.Position;
     6import lombok.NoArgsConstructor;
    67import mk.ukim.finki.it.reservengo.model.enumerations.Role;
    78
    89@EqualsAndHashCode(callSuper = true)
    910@Entity
     11@NoArgsConstructor
     12@Data
    1013public class LocalManager extends LocalWorker {
    1114    public LocalManager(String firstName, String lastName, String email, String password, String phoneNumber, Role userRole) {
     
    1316    }
    1417
    15     public LocalManager(String firstName, String lastName, String email, String password, String phoneNumber, Role userRole, Position position, Local local) {
    16         super(firstName, lastName, email, password, phoneNumber, userRole, position, local);
    17     }
    18 
    19     public LocalManager() {
    20     }
    2118}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/LocalWorker.java

    r7d8eeab r349551d  
    55import jakarta.persistence.Enumerated;
    66import jakarta.persistence.ManyToOne;
     7import lombok.AllArgsConstructor;
     8import lombok.Data;
    79import lombok.EqualsAndHashCode;
     10import lombok.NoArgsConstructor;
    811import mk.ukim.finki.it.reservengo.model.enumerations.Position;
    912import mk.ukim.finki.it.reservengo.model.enumerations.Role;
     
    1114@EqualsAndHashCode(callSuper = true)
    1215@Entity
     16@AllArgsConstructor
     17@NoArgsConstructor
     18@Data
    1319public class LocalWorker extends User {
    14     public LocalWorker(String firstName, String lastName, String email, String password, String phoneNumber, Role userRole) {
    15         super(firstName, lastName, email, password, phoneNumber, userRole);
    16     }
    17 
    18     public LocalWorker(String firstName, String lastName, String email, String password, String phoneNumber, Role userRole, Position position, Local local) {
    19         super(firstName, lastName, email, password, phoneNumber, userRole);
    20         this.position = position;
    21         this.local = local;
    22     }
    23 
    24     public LocalWorker() {
    25     }
    26 
    2720    @ManyToOne
    2821    private Local local;
     
    3124    private Position position;
    3225
    33     public Local getLocal() {
    34         return local;
     26    public LocalWorker(String firstName, String lastName, String email, String password, String phoneNumber, Role userRole) {
     27        super(firstName, lastName, email, password, phoneNumber, userRole);
    3528    }
    3629
    37     public Position getPosition() {
    38         return position;
    39     }
    4030}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/Reservation.java

    r7d8eeab r349551d  
    22
    33import jakarta.persistence.*;
    4 import lombok.AllArgsConstructor;
    5 import lombok.Data;
    6 import lombok.NoArgsConstructor;
     4import lombok.*;
    75import mk.ukim.finki.it.reservengo.model.enumerations.ReservationStatus;
    86
     
    1513@NoArgsConstructor
    1614public class Reservation {
    17     public Reservation(Customer customer, Local local, LocalDateTime timeOfRes, Map<Integer, Integer> reservedTables, ReservationStatus status) {
    18         this.customer = customer;
    19         this.local = local;
    20         this.timeOfRes = timeOfRes;
    21         this.reservedTables = reservedTables;
    22         this.status = status;
    23     }
    24 
    2515    @Id
    2616    @GeneratedValue(strategy = GenerationType.IDENTITY)
     
    4333    private ReservationStatus status;
    4434
    45     public void setStatus(ReservationStatus status) {
    46         this.status = status;
    47     }
    48 
    49     public ReservationStatus getStatus() {
    50         return status;
    51     }
    52 
    53     public Long getId() {
    54         return id;
    55     }
    56 
    57     public void setId(Long id) {
    58         this.id = id;
    59     }
    60 
    61     public Customer getCustomer() {
    62         return customer;
    63     }
    64 
    65     public void setCustomer(Customer customer) {
    66         this.customer = customer;
    67     }
    68 
    69     public Local getLocal() {
    70         return local;
    71     }
    72 
    73     public void setLocal(Local local) {
    74         this.local = local;
    75     }
    76 
    77     public LocalDateTime getTimeOfRes() {
    78         return timeOfRes;
    79     }
    80 
    81     public void setTimeOfRes(LocalDateTime timeOfRes) {
    82         this.timeOfRes = timeOfRes;
    83     }
    84 
    85     public Map<Integer, Integer> getReservedTables() {
    86         return reservedTables;
    87     }
    88 
    89     public void setReservedTables(Map<Integer, Integer> reservedTables) {
    90         this.reservedTables = reservedTables;
    91     }
    9235}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/domain/User.java

    r7d8eeab r349551d  
    33import com.fasterxml.jackson.annotation.JsonIgnore;
    44import jakarta.persistence.*;
     5import lombok.AllArgsConstructor;
     6import lombok.Data;
     7import lombok.NoArgsConstructor;
    58import mk.ukim.finki.it.reservengo.model.enumerations.Role;
    69import org.springframework.security.core.GrantedAuthority;
     
    1417@Inheritance(strategy = InheritanceType.JOINED)
    1518@Table(name = "app_user")
     19@Data
     20@AllArgsConstructor
     21@NoArgsConstructor
    1622public class User implements UserDetails {
    1723    public User(String firstName, String lastName, String email, String password, String phoneNumber, Role userRole) {
     
    2228        this.phoneNumber = phoneNumber;
    2329        this.userRole = userRole;
    24     }
    25 
    26     public User() {
    2730    }
    2831
     
    8083        return true;
    8184    }
    82 
    83     public Long getId() {
    84         return id;
    85     }
    86 
    87     public String getFirstName() {
    88         return firstName;
    89     }
    90 
    91     public String getLastName() {
    92         return lastName;
    93     }
    94 
    95     public String getEmail() {
    96         return email;
    97     }
    98 
    99     public String getPhoneNumber() {
    100         return phoneNumber;
    101     }
    102 
    103     public Role getUserRole() {
    104         return userRole;
    105     }
    106 
    107     public void setId(Long id) {
    108         this.id = id;
    109     }
    110 
    111     public void setFirstName(String firstName) {
    112         this.firstName = firstName;
    113     }
    114 
    115     public void setLastName(String lastName) {
    116         this.lastName = lastName;
    117     }
    118 
    119     public void setEmail(String email) {
    120         this.email = email;
    121     }
    122 
    123     public void setPassword(String password) {
    124         this.password = password;
    125     }
    126 
    127     public void setPhoneNumber(String phoneNumber) {
    128         this.phoneNumber = phoneNumber;
    129     }
    130 
    131     public void setUserRole(Role userRole) {
    132         this.userRole = userRole;
    133     }
    13485}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/AuthServiceImpl.java

    r7d8eeab r349551d  
    4343    @Override
    4444    public JWTAuthenticationResponseDTO registerCustomer(JWTAuthenticationRequestDTO jwtAuthenticationRequestDTO) {
    45 
    46         Customer customer = new Customer(
    47                 jwtAuthenticationRequestDTO.firstName(),
    48                 jwtAuthenticationRequestDTO.lastName(),
    49                 jwtAuthenticationRequestDTO.email(),
    50                 passwordEncoder.encode(jwtAuthenticationRequestDTO.password()),
    51                 jwtAuthenticationRequestDTO.phoneNumber(),
    52                 Role.ROLE_CUSTOMER
    53         );
     45        Customer customer = jwtAuthenticationRequestDTO.toCustomer(passwordEncoder.encode(jwtAuthenticationRequestDTO.password()));
    5446
    5547        customerRepository.save(customer);
    5648        String jwt = jwtService.generateToken(customer);
    5749
    58         return new JWTAuthenticationResponseDTO(
    59                 customer.getId(),
    60                 customer.getFirstName(),
    61                 customer.getLastName(),
    62                 customer.getEmail(),
    63                 customer.getPhoneNumber(),
    64                 Role.ROLE_CUSTOMER,
    65                 jwt);
     50        return JWTAuthenticationResponseDTO.toCustomer(customer, jwt);
    6651    }
    6752
    6853    @Override
    6954    public JWTAuthenticationResponseDTO registerLocalWorker(JWTAuthenticationRequestDTO jwtAuthenticationRequestDTO) {
    70         LocalWorker localWorker = new LocalWorker(
    71                 jwtAuthenticationRequestDTO.firstName(),
    72                 jwtAuthenticationRequestDTO.lastName(),
    73                 jwtAuthenticationRequestDTO.email(),
    74                 passwordEncoder.encode(jwtAuthenticationRequestDTO.password()),
    75                 jwtAuthenticationRequestDTO.phoneNumber(),
    76                 Role.ROLE_LOCAL_WORKER
    77         );
     55        LocalWorker localWorker = jwtAuthenticationRequestDTO.toLocalWorker(passwordEncoder.encode(jwtAuthenticationRequestDTO.password()));
     56
    7857        localWorkerRepository.save(localWorker);
    7958        String jwt = jwtService.generateToken(localWorker);
    8059
    81         return new JWTAuthenticationResponseDTO(
    82                 localWorker.getId(),
    83                 localWorker.getFirstName(),
    84                 localWorker.getLastName(),
    85                 localWorker.getEmail(),
    86                 localWorker.getPhoneNumber(),
    87                 Role.ROLE_LOCAL_WORKER,
    88                 jwt);
     60        return JWTAuthenticationResponseDTO.toLocalWorker(localWorker, jwt);
    8961    }
    9062
    9163    @Override
    9264    public JWTAuthenticationResponseDTO registerLocalManager(JWTAuthenticationRequestDTO jwtAuthenticationRequestDTO) {
    93         LocalManager localManager = new LocalManager(
    94                 jwtAuthenticationRequestDTO.firstName(),
    95                 jwtAuthenticationRequestDTO.lastName(),
    96                 jwtAuthenticationRequestDTO.email(),
    97                 passwordEncoder.encode(jwtAuthenticationRequestDTO.password()),
    98                 jwtAuthenticationRequestDTO.phoneNumber(),
    99                 Role.ROLE_LOCAL_MANAGER
    100         );
     65        LocalManager localManager = jwtAuthenticationRequestDTO.toLocalManager(passwordEncoder.encode(jwtAuthenticationRequestDTO.password()));
     66
    10167        localManagerRepository.save(localManager);
    10268        String jwt = jwtService.generateToken(localManager);
    10369
    104         return new JWTAuthenticationResponseDTO(
    105                 localManager.getId(),
    106                 localManager.getFirstName(),
    107                 localManager.getLastName(),
    108                 localManager.getEmail(),
    109                 localManager.getPhoneNumber(),
    110                 Role.ROLE_LOCAL_MANAGER,
    111                 jwt);
     70        return JWTAuthenticationResponseDTO.toLocalManager(localManager, jwt);
    11271    }
    11372
     
    11574    public JWTAuthenticationResponseDTO login(JWTLoginDTO jwtLoginDTO) {
    11675        authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(jwtLoginDTO.email(), jwtLoginDTO.password()));
     76
    11777        User user = userRepository.findByEmail(jwtLoginDTO.email()).orElseThrow(() -> new EmailNotFoundException(jwtLoginDTO.email()));
    11878        String jwt = jwtService.generateToken(user);
    11979
    120         return new JWTAuthenticationResponseDTO(
    121                 user.getId(),
    122                 user.getFirstName(),
    123                 user.getLastName(),
    124                 user.getEmail(),
    125                 user.getPhoneNumber(),
    126                 user.getUserRole(),
    127                 jwt);
     80        return JWTAuthenticationResponseDTO.toUser(user, jwt);
    12881    }
    12982}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/UserService.java

    r7d8eeab r349551d  
    88
    99    User editUserInfo(Long userId, CreateUserDTO createUserDTO);
    10 
    1110}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/LocalManagerController.java

    r7d8eeab r349551d  
    2222        return ResponseEntity.ok().build();
    2323    }
     24    //TODO implement delete logo
     25    @PostMapping("/{localId}/upload-photos")
     26    //TODO implement this next
     27    public ResponseEntity<?> uploadPhotos(@PathVariable Long localId) {
     28        return ResponseEntity.ok().build();
     29    }
    2430
    2531}
Note: See TracChangeset for help on using the changeset viewer.