Index: backend/pom.xml =================================================================== --- backend/pom.xml (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/pom.xml (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -6,5 +6,5 @@ org.springframework.boot spring-boot-starter-parent - 3.3.5 + 3.4.2 @@ -41,4 +41,9 @@ spring-boot-starter-test test + + + + org.springframework.boot + spring-boot-starter-validation @@ -86,4 +91,8 @@ spring-boot-starter-mail + + org.springframework.boot + spring-boot-starter-actuator + Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/DistributorAppApplication.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/DistributorAppApplication.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/DistributorAppApplication.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -3,6 +3,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; @SpringBootApplication +@ServletComponentScan public class DistributorAppApplication { @@ -11,5 +13,3 @@ } - - } Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/config/CustomUserDetailsService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/config/CustomUserDetailsService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,33 +1,0 @@ -package mk.ukim.finki.db.distributorapp.config; - -import mk.ukim.finki.db.distributorapp.model.entities.Users; -import mk.ukim.finki.db.distributorapp.repository.UsersRepository; -import mk.ukim.finki.db.distributorapp.security.PassEncryptionPasswordEncoder; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.stereotype.Service; - -@Service -public class CustomUserDetailsService implements UserDetailsService { - - private final UsersRepository usersRepository; - private final PassEncryptionPasswordEncoder passwordEncoder; - - public CustomUserDetailsService(UsersRepository usersRepository, PassEncryptionPasswordEncoder passwordEncoder) { - this.usersRepository = usersRepository; - this.passwordEncoder = passwordEncoder; - } - - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - Users user = this.usersRepository.findUserByUserEmailIgnoreCase(username) - .orElseThrow(() -> new UsernameNotFoundException(username)); - - return user; - } - - public boolean authenticateUser(String providedPassword, Users user) { - return passwordEncoder.matchesWithSalt(providedPassword, user.getPassword(), user.getUserSalt()); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/config/SecurityConfig.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/config/SecurityConfig.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,88 +1,0 @@ -package mk.ukim.finki.db.distributorapp.config; - -import mk.ukim.finki.db.distributorapp.security.PassEncryptionPasswordEncoder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.SecurityFilterChain; - -@Configuration -@EnableWebSecurity -public class SecurityConfig { - - private final CustomUserDetailsService userDetailsService; - - public SecurityConfig(CustomUserDetailsService userDetailsService) { - this.userDetailsService = userDetailsService; - } - - // FOR TESTING: - @Bean - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { - http - .csrf(AbstractHttpConfigurer::disable) - .authorizeHttpRequests(auth -> auth - .anyRequest().permitAll() - ) - .formLogin(AbstractHttpConfigurer::disable) - .logout(AbstractHttpConfigurer::disable); - - return http.build(); - } - - - // FOR PRODUCTION: - - /** - * @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { - * // http - * // .authorizeHttpRequests(authorize -> authorize - * // .requestMatchers("/login","/register").permitAll() - * // .anyRequest().authenticated() - * // ) - * // .formLogin(form -> form - * // .loginPage("/login") - * // .permitAll() - * // ) - * // .logout(LogoutConfigurer::permitAll); - *

- * http - * .csrf(AbstractHttpConfigurer::disable) - * .authorizeHttpRequests(auth -> auth - * .requestMatchers("/register", "/login", "/css/**", "/js/**").permitAll() - * .requestMatchers("/manager/**").hasAuthority("Manager") - * .requestMatchers("/driver/**").hasAuthority("Driver") - * .requestMatchers("/customer/**").hasAuthority("Customer") - * .anyRequest().authenticated() - * ) - * .formLogin(login -> login - * .loginPage("/login") - * .defaultSuccessUrl("/home", true) - * .permitAll() - * ) - * .logout(logout -> logout - * .logoutUrl("/logout") - * .logoutSuccessUrl("/login") - * .permitAll() - * ); - *

- * return http.build(); - * } - **/ - - - @Bean - public AuthenticationManager authManager(AuthenticationConfiguration authConfig) throws Exception { - return authConfig.getAuthenticationManager(); - } - - @Bean - public PasswordEncoder passwordEncoder() { - return new PassEncryptionPasswordEncoder(); - } -} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ChangePasswordDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ChangePasswordDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ChangePasswordDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,14 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ChangePasswordDto { + String email; + String oldPassword; + String newPassword; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CityDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CityDto.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CityDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -7,6 +7,7 @@ @Data @AllArgsConstructor +@NoArgsConstructor public class CityDto { - private Long id; + private Integer id; private String name; private Integer regionId; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CityDtoRegister.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CityDtoRegister.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CityDtoRegister.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,11 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class CityDtoRegister { + private Integer id; + private String name; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CreateDriverDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CreateDriverDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CreateDriverDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,20 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CreateDriverDto { + private String name; + private String surname; + private String password; + private String repeatedPassword; + private String email; + private String mobile; + private String profileImage; + private Integer city; + private Integer vehicle; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CreateManagerDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CreateManagerDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CreateManagerDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,20 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CreateManagerDto { + private String name; + private String surname; + private String password; + private String repeatedPassword; + private String email; + private String mobile; + private String profileImage; + private Integer city; + private Integer warehouseId; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DriverDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DriverDto.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DriverDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -3,7 +3,9 @@ import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data @AllArgsConstructor +@NoArgsConstructor public class DriverDto { private Long id; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/LoginRequestDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/LoginRequestDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/LoginRequestDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,13 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LoginRequestDto { + private String email; + private String password; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/LoginResponseDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/LoginResponseDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/LoginResponseDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,12 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LoginResponseDto { + private String token; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ManagerDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ManagerDto.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ManagerDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -3,7 +3,9 @@ import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data @AllArgsConstructor +@NoArgsConstructor public class ManagerDto { private Long id; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/RegisterRequestDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/RegisterRequestDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/RegisterRequestDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,23 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RegisterRequestDto { + private String name; + private String surname; + private String password; + private String repeatedPassword; + private String email; + private String mobile; + private String profileImage; + private Integer city; + private String edb; + private String compName; + private String address; + private String repImage; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/UserDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/UserDto.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/UserDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -3,7 +3,12 @@ import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.enumerations.Role; + +import java.time.LocalDateTime; @Data @AllArgsConstructor +@NoArgsConstructor public class UserDto { private Long id; @@ -13,6 +18,10 @@ private String phone; private String image; - private Long cityId; + private Integer cityId; private String cityName; private String regionName; + private Role role; + private String rtoken; + private LocalDateTime rtoken_exp; + private String clazz_; } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/VehicleBasicDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/VehicleBasicDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/VehicleBasicDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,12 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class VehicleBasicDto { + private Integer id; + private Integer warehouseId; + private String plateNumber; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WarehouseDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WarehouseDto.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WarehouseDto.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -3,11 +3,13 @@ import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data @AllArgsConstructor +@NoArgsConstructor public class WarehouseDto { private Integer id; private String address; - private Long cityId; + private Integer cityId; private String cityName; private Integer regionId; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Article.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Article.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Article.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -3,4 +3,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; @@ -16,18 +18,25 @@ private Long articleId; + @Size(max = 255) + @NotNull @Column(name = "art_name", nullable = false) private String articleName; + @NotNull @Column(name = "art_weight", nullable = false) private Integer articleWeight; + @Size(max = 255) + @NotNull @Column(name = "art_image", nullable = false) private String artImage; - @ManyToOne + @NotNull + @ManyToOne(fetch = FetchType.LAZY,optional = false) @JoinColumn(name = "ctg_id", nullable = false) private Category category; - @ManyToOne + @NotNull + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "man_id", nullable = false) private Manufacturer manufacturer; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ArticleUnit.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ArticleUnit.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ArticleUnit.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,7 +2,11 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; import java.util.Date; +import java.util.LinkedHashSet; +import java.util.Set; @Entity @@ -14,24 +18,33 @@ private Long unitId; + @NotNull @Column(name = "unit_expiration_date", nullable = false) private Date unitExpirationDate; + @Size(max = 255) + @NotNull @Column(name = "unit_serial_number", nullable = false) private String unitSerialNumber; + @Size(max = 255) + @NotNull @Column(name = "unit_batch_number", nullable = false) private String unitBatchNumber; + @NotNull @Column(name = "unit_manufacture_date", nullable = false) private Date unitManufactureDate; + @NotNull @Column(name = "unit_cost_price", nullable = false) private Double unitCostPrice; - @ManyToOne + @NotNull + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "art_id", nullable = false) private Article article; - @ManyToOne(fetch = FetchType.LAZY) + @NotNull + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "wh_id",nullable = false) private Warehouse warehouse; @@ -40,3 +53,11 @@ @JoinColumn(name = "ord_id") private Orders order; + + @ManyToMany + @JoinTable( + name="unit_price", + joinColumns = @JoinColumn(name="unit_id"), + inverseJoinColumns = @JoinColumn(name="price_id") + ) + private Set prices = new LinkedHashSet<>(); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Category.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Category.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Category.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; @@ -15,4 +17,6 @@ private Long categoryId; + @Size(max = 255) + @NotNull @Column(name = "ctg_name", nullable = false) private String categoryName; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/City.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/City.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/City.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; @@ -13,6 +15,8 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "city_id") - private Long cityId; + private Integer cityId; + @Size(max = 255) + @NotNull @Column(name = "city_name", nullable = false) private String cityName; @@ -24,4 +28,5 @@ private Warehouse warehouse; + @NotNull @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "region_id", nullable = false) Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Customer.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Customer.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Customer.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,19 +13,31 @@ @Data @Table(name = "customer") -@DiscriminatorValue(value = "Customer") +@DiscriminatorValue("CUSTOMER") +@PrimaryKeyJoinColumn(name = "user_id") public class Customer extends Users { + @Size(max = 13) + @NotNull @Column(name = "cust_EDB", nullable = false, length = 13) private String customerEDB; + @Size(max = 255) + @NotNull @Column(name = "cust_company_name", nullable = false) private String customerCompanyName; + @Size(max = 255) + @NotNull @Column(name = "cust_adr", nullable = false) private String customerAddress; - @Column(name = "cust_representative_img", nullable = false) + @Size(max = 255) + @NotNull + @Column(name = "cust_representative_img") private String customerRepresentativeImage; - @OneToMany(mappedBy = "customer") + @OneToMany(mappedBy = "customer", fetch = FetchType.EAGER) private List orders; + + @OneToMany(mappedBy = "customer", fetch = FetchType.EAGER) + private List customerWeekdays; } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/CustomerWeekday.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/CustomerWeekday.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/CustomerWeekday.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,5 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -17,15 +18,19 @@ private Long customerDayId; + @NotNull @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "cust_id", nullable = false) private Customer customer; + @NotNull @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "day_id", nullable = false) private Weekday day; + @NotNull @Column(name = "start_time", nullable = false) private LocalTime customerDayStartTime; + @NotNull @Column(name = "end_time", nullable = false) private LocalTime customerDayEndTime; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Delivery.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Delivery.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Delivery.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,5 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -17,7 +18,9 @@ private Long deliveryId; + @NotNull @Column(name = "del_date_created", nullable = false) private LocalDate deliveryDateCreated; + @NotNull @Column(name = "del_date", nullable = false) private LocalDate deliveryDate; @@ -35,9 +38,11 @@ private LocalTime deliveryEndTime; - @ManyToOne + @NotNull + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "d_status_id", nullable = false) private DeliveryStatus deliveryStatus; - @ManyToOne + @NotNull + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "veh_id", nullable = false) private Vehicle vehicle; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/DeliveryStatus.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/DeliveryStatus.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/DeliveryStatus.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; @@ -8,4 +10,5 @@ @Entity @Data +@Table(name = "delivery_status") public class DeliveryStatus { @Id @@ -14,7 +17,10 @@ private Short deliveryStatusId; + @Size(max = 255) + @NotNull @Column(name = "d_status_name", nullable = false) private String deliveryStatusName; + @NotNull @Column(name = "d_status_desc", nullable = false) private String deliveryStatusDescription; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Driver.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Driver.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Driver.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,5 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,6 +10,8 @@ @Data @Table(name = "driver") -@DiscriminatorValue(value = "Driver") +@DiscriminatorValue("DRIVER") +@PrimaryKeyJoinColumn(name = "user_id") public class Driver extends Users { + @NotNull @OneToOne @JoinColumn(name = "veh_id", nullable = false) Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Manager.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Manager.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Manager.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,5 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,6 +10,8 @@ @Data @Table(name = "manager") -@DiscriminatorValue(value = "Manager") +@DiscriminatorValue("MANAGER") +@PrimaryKeyJoinColumn(name = "user_id") public class Manager extends Users { + @NotNull @OneToOne @JoinColumn(name = "wh_id", nullable = false, unique = true) Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Manufacturer.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Manufacturer.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Manufacturer.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; @@ -15,13 +17,21 @@ private Long manufacturerId; + @Size(max = 255) + @NotNull @Column(name = "man_name", nullable = false) private String manufacturerName; + @Size(max = 255) + @NotNull @Column(name = "man_adr", nullable = false) private String manufacturerAddress; + @Size(max = 255) + @NotNull @Column(name = "man_mobile", nullable = false) private String manufacturerMobile; + @Size(max = 255) + @NotNull @Column(name = "man_email", nullable = false) private String manufacturerEmail; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/OrderStatus.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/OrderStatus.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/OrderStatus.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; @@ -8,4 +10,5 @@ @Entity @Data +@Table(name="order_status", schema = "IND0_185022") public class OrderStatus { @Id @@ -14,7 +17,10 @@ private Short orderStatusId; + @Size(max = 255) + @NotNull @Column(name = "o_status_name", nullable = false) private String orderStatusName; + @NotNull @Column(name = "o_status_desc", nullable = false) private String orderStatusDescription; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Orders.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Orders.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Orders.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,5 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -17,7 +18,9 @@ private Long orderId; + @NotNull @Column(name = "ord_date", nullable = false) private LocalDate orderDate; + @NotNull @Column(name = "ord_sum", nullable = false) private Integer orderSum; @@ -29,13 +32,15 @@ private String orderComment; - @ManyToOne + @NotNull + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "o_status_id", nullable = false) private OrderStatus orderStatus; - @ManyToOne - @JoinColumn(name = "cust_id") + @NotNull + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "cust_id", nullable = false) private Customer customer; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "del_id", nullable = false) private Delivery delivery; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Price.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Price.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Price.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,8 +2,12 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Data; +import org.hibernate.annotations.ColumnDefault; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.LinkedHashSet; +import java.util.Set; @Entity @@ -16,13 +20,22 @@ private Integer priceId; + @NotNull @Column(name = "price", nullable = false) private BigDecimal price; + @NotNull + @ColumnDefault("CURRENT_TIMESTAMP") @Column(name = "price_eff_date", nullable = false) private LocalDateTime priceEffectiveDate; - @ManyToOne + @NotNull + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "art_id", nullable = false) private Article article; + @ManyToMany + @JoinTable(name = "unit_price", + joinColumns = @JoinColumn(name = "price_id"), + inverseJoinColumns = @JoinColumn(name = "unit_id")) + private Set articleUnits = new LinkedHashSet<>(); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ProForma.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ProForma.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ProForma.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,5 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -15,11 +16,14 @@ private Long proFormaId; + @NotNull @Column(name = "pf_deadline", nullable = false) private LocalDate proFormaDeadline; + @NotNull @Column(name = "pf_date_created", nullable = false) private LocalDate proFormaDateCreated; - @ManyToOne + @NotNull + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "pf_status_id", nullable = false) private ProFormaStatus proFormaStatus; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ProFormaStatus.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ProFormaStatus.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ProFormaStatus.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; @@ -8,4 +10,5 @@ @Entity @Data +@Table(name = "pro_forma_status", schema = "IND0_185022") public class ProFormaStatus { @Id @@ -14,7 +17,10 @@ private Short proFormaStatusId; + @Size(max = 255) + @NotNull @Column(name = "pf_status_name", nullable = false) private String proFormaStatusName; + @NotNull @Column(name = "pf_status_desc", nullable = false) private String proFormaStatusDescription; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Region.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Region.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Region.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; @@ -15,4 +17,6 @@ private Integer regionId; + @Size(max = 255) + @NotNull @Column(name = "region_name", nullable = false) private String regionName; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Users.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Users.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Users.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,11 +2,17 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.enumerations.Role; +import mk.ukim.finki.db.distributorapp.security.ConfirmationToken; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -16,38 +22,75 @@ @NoArgsConstructor @Inheritance(strategy = InheritanceType.JOINED) +@DiscriminatorColumn( + name = "clazz_", + discriminatorType = DiscriminatorType.STRING +) @Data @Table(name = "users") -public class Users implements UserDetails { +public class Users implements UserDetails{ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "user_id") private Long userId; + @Size(max = 255) + @NotNull @Column(name = "user_name", nullable = false) private String userName; + @Size(max = 255) + @NotNull @Column(name = "user_surname", nullable = false) private String userSurname; + @Size(max = 255) + @NotNull @Column(name = "user_pass", nullable = false) private String userPassword; + @Size(max = 255) + @NotNull @Column(name = "user_email", nullable = false) private String userEmail; + @Size(max = 255) + @NotNull @Column(name = "user_mobile", nullable = false) private String userMobile; + @Size(max = 255) + @NotNull @Column(name = "user_salt", nullable = false) private String userSalt; + @NotNull @Column(name = "user_active", nullable = false) private Boolean userActive; + @Size(max = 255) @Column(name = "user_image") private String userImage; - @ManyToOne + @Enumerated(EnumType.STRING) + @Column(name = "user_role") + private Role userRole; + + @Size(max = 255) + @Column(name = "user_rtoken") + private String userResetToken; + + @Column(name = "user_rtoken_exp") + private LocalDateTime userResetTokenExpiry; + + @NotNull + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "city_id", nullable = false) private City city; + + @Column(name = "clazz_", insertable = false, updatable = false) + private String clazz_; + + @OneToOne(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) + private ConfirmationToken confirmationToken; @Override @@ -63,5 +106,7 @@ @Override public Collection getAuthorities() { - return List.of(new SimpleGrantedAuthority(this.getClass().getSimpleName())); + List authorities = new ArrayList<>(); + authorities.add(new SimpleGrantedAuthority(this.getUserRole().name())); + return authorities; } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Vehicle.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Vehicle.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Vehicle.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; @@ -16,10 +18,13 @@ private Integer vehicleId; + @NotNull @Column(name = "veh_carry_weight", nullable = false) private Integer vehicleCarryWeight; + @NotNull @Column(name = "veh_service_interval", nullable = false) private Short vehicleServiceInterval; + @NotNull @Column(name = "veh_kilometers", nullable = false) private Integer vehicleKilometers; @@ -31,14 +36,20 @@ private Integer vehicleLastServiceKm; + @Size(max = 8) + @NotNull @Column(name = "veh_plate", nullable = false, length = 8) private String vehiclePlate; + @Size(max = 17) + @NotNull @Column(name = "veh_vin", nullable = false, length = 17) private String vehicleVin; + @NotNull @Column(name = "veh_reg", nullable = false) private LocalDate vehicleRegDate; - @ManyToOne + @NotNull + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "wh_id", nullable = false) private Warehouse warehouse; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Warehouse.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Warehouse.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Warehouse.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; @@ -15,4 +17,6 @@ private Integer warehouseId; + @Size(max = 255) + @NotNull @Column(name = "wh_adr", nullable = false) private String warehouseAddress; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Weekday.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Weekday.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Weekday.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,6 @@ import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; @@ -15,4 +17,6 @@ private Short id; + @Size(max = 20) + @NotNull @Column(name = "day_name", nullable = false, length = 20) private String dayName; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/enumerations/Role.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/enumerations/Role.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/enumerations/Role.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,12 @@ +package mk.ukim.finki.db.distributorapp.model.enumerations; + +import org.springframework.security.core.GrantedAuthority; + +public enum Role implements GrantedAuthority { + ROLE_CUSTOMER, ROLE_MANAGER, ROLE_DRIVER, ROLE_ADMIN; + + @Override + public String getAuthority() { + return ""; + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CityRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CityRepository.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CityRepository.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,5 @@ import lombok.NonNull; +import mk.ukim.finki.db.distributorapp.model.dto.CityDtoRegister; import mk.ukim.finki.db.distributorapp.model.entities.City; import org.springframework.data.jpa.repository.JpaRepository; @@ -15,8 +16,17 @@ @Query( nativeQuery = true, - value = "select * " + - "from city c" + value = "select c.* " + + "from city c join region r on c.region_id = r.region_id" ) List listAll(); + + @Query( + nativeQuery = true, + value = """ + select c.city_id as id, c.city_name as name + from city c + """ + ) + List findAllCityDtos(); @Query( @@ -26,5 +36,6 @@ "where c.city_id = ?1" ) - Optional findById(@NonNull Long id); + @Transactional + Optional findById(@NonNull Integer id); @Query( @@ -56,5 +67,5 @@ ) Integer edit( - @NonNull Long id, + @NonNull Integer id, @NonNull String name, @NonNull Integer region); @@ -67,4 +78,4 @@ "where c.city_id=?1" ) - void deleteById(@NonNull Long id); + void deleteById(@NonNull Integer id); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CustomerRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CustomerRepository.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CustomerRepository.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -8,5 +8,4 @@ import org.springframework.transaction.annotation.Transactional; -import java.time.LocalTime; import java.util.List; import java.util.Optional; @@ -30,7 +29,10 @@ @Query( nativeQuery = true, - value = "select * " + - "from customer " + - "where user_id=?1" + value = """ + select * + from customer c + join users u on c.user_id = u.user_id + where c.user_id = ?1 + """ ) Optional findById(@NonNull Long id); @@ -40,6 +42,8 @@ @Query( nativeQuery = true, - value = "insert into customer(user_id, cust_edb, cust_company_name, cust_address, cust_representative_img) " + - "values (?1,?2,?3,?4,?5)" + value = """ + insert into customer(user_id, cust_edb, cust_company_name, cust_adr, cust_representative_img) + values (?1,?2,?3,?4,?5) + """ ) Integer create( @@ -55,5 +59,5 @@ nativeQuery = true, value = "update customer " + - "set cust_edb=?2,cust_company_name=?3,cust_address=?4,cust_representative_img=?5 " + + "set cust_edb=?2,cust_company_name=?3,cust_adr=?4,cust_representative_img=?5 " + "where user_id=?1" ) Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -6,4 +6,5 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; @@ -87,3 +88,40 @@ ) void delete(@NonNull Long id); + + //------------------------------------------------------------------------------------------------------------------ + @Query( + nativeQuery = true, + value = """ + select de.* + from driver d join vehicle v on d.veh_id = v.veh_id + join delivery de on v.veh_id = de.veh_id + where d.user_id=:driver and de.d_status_id =1 + order by de.del_date desc; + """ + ) + List getNewDeliveriesByDriver(@NonNull @Param("driver") Long driver_id); + + @Query( + nativeQuery = true, + value = """ + select d.* + from delivery d join orders o on o.del_id=d.del_id + where o.cust_id=:customer and d.d_status_id <> 4; + """ + ) + List getCurrentDeliveriesByCustomer(@NonNull @Param("customer") Long customer_id); + + @Query( + nativeQuery = true, + value = """ + select d.* + from warehouse w + join manager m on w.wh_id = m.wh_id + join article_unit au on w.wh_id = au.wh_id + join orders o on au.ord_id = o.ord_id + join delivery d on o.del_id = d.del_id + where m.user_id=:manager and d.d_status_id<>4 + """ + ) + List getCurrentDeliveriesByManager(@NonNull @Param("manager") Long manager_id); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -27,5 +27,9 @@ @Query( nativeQuery = true, - value = "select * from driver where user_id=?1" + value = """ + select * + from driver d join users u on d.user_id = u.user_id + where d.user_id=?1 + """ ) Optional findById(@NonNull Long id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManagerRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManagerRepository.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManagerRepository.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -27,5 +27,9 @@ @Query( nativeQuery = true, - value = "select * from manager where user_id=?1" + value = """ + select * + from manager m join users u on m.user_id = u.user_id + where m.user_id=?1 + """ ) Optional findById(@NonNull Long id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -6,4 +6,5 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; @@ -77,3 +78,29 @@ ) void delete(@NonNull Long id); + //---------------------------------------------------------------------------------------------------------------------------------- + + @Query( + nativeQuery = true, + value = """ + select * + from orders o + where o.cust_id=:customer and o.o_status_id between 2 and 6 + """ + ) + List getCurrentOrdersByCustomer(@NonNull @Param("customer") Long customer_id); + + @Query( + nativeQuery = true, + value = """ + select o.* + from warehouse w + join manager m on w.wh_id= m.wh_id + join article_unit au on au.wh_id = w.wh_id + join orders o on au.ord_id = o.ord_id + where m.user_id = :manager + and o.o_status_id = 1 + order by o.ord_date desc + """ + ) + List getNewOrdersByManager(@NonNull @Param("manager") Long manager_id); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/RegionRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/RegionRepository.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/RegionRepository.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,8 +2,10 @@ import lombok.NonNull; +import mk.ukim.finki.db.distributorapp.model.dto.RegionDto; import mk.ukim.finki.db.distributorapp.model.entities.Region; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; @@ -65,3 +67,15 @@ ) void deleteById(@NonNull Integer id); + +// ------------------------------------------------------------------------- + + @Query( + nativeQuery = true, + value = """ + select r.region_id as id, r.region_name as name + from region r join city c on r.region_id = c.region_id + where c.city_id = :city + """ + ) + RegionDto getRegionByCityId(@NonNull @Param("city") Integer cityId); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/UsersRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/UsersRepository.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/UsersRepository.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -9,4 +9,5 @@ import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -15,10 +16,12 @@ @Query( nativeQuery = true, - value = "select u.*,c.*,d.*,m.*, 0 AS clazz_ " + - "from users u " + - "left join customer c on u.user_id = c.user_id " + - "left join driver d on u.user_id = d.user_id " + - "left join manager m on u.user_id = m.user_id " + - "order by u.user_id" + value = """ + select * + from users u + left join customer c on u.user_id = c.user_id + left join driver d on u.user_id = d.user_id + left join manager m on u.user_id = m.user_id + order by u.user_id + """ ) List listAll(); @@ -26,5 +29,12 @@ @Query( nativeQuery = true, - value = "select * from users where user_name like :name" + value = """ + select * + from users u + left join customer c on u.user_id = c.user_id + left join driver d on u.user_id = d.user_id + left join manager m on u.user_id = m.user_id + where u.user_name like :name + """ ) List findAllByName(@NonNull @Param("name") String name); @@ -32,7 +42,14 @@ @Query( nativeQuery = true, - value = "select * from users where user_id=:id" + value = """ + select * + from users u + left join customer c on u.user_id = c.user_id + left join driver d on u.user_id = d.user_id + left join manager m on u.user_id = m.user_id + where u.user_id=:id + """ ) - Optional findById(@NonNull @Param("id") Short id); + Optional findById(@NonNull @Param("id") Long id); @Modifying @@ -40,6 +57,6 @@ @Query( nativeQuery = true, - value = "insert into users(user_name, user_surname, user_pass, user_salt, user_email, user_mobile, user_email_conf, user_image, city_id) " + - "values (:name,:sur,:pass,:salt,:email,:mob,:active,:img,:cty)" + value = "insert into users(user_name,user_surname,user_pass,user_salt,user_email,user_mobile,user_active,user_image,city_id,user_role,user_rtoken,user_rtoken_exp,clazz_) " + + "values (:name,:sur,:pass,:salt,:email,:mob,:active,:img,:cty,:role,:rtoken,:rtoken_exp,:clazz_)" ) Integer create( @@ -51,6 +68,10 @@ @NonNull @Param("salt") String salt, @NonNull @Param("active") Boolean active, - @NonNull @Param("img") String image, - @NonNull @Param("cty") Long city_id); + @Param("img") String image, + @NonNull @Param("cty") Integer city_id, + @NonNull @Param("role") String role, + @Param("rtoken") String rtoken, + @Param("rtoken_exp") LocalDateTime rtoken_exp, + @NonNull @Param("clazz_") String clazz_); @Modifying @@ -59,5 +80,5 @@ nativeQuery = true, value = "update users " + - "set user_name=:name,user_surname=:sur,user_pass=:pass,user_email=:email,user_mobile=:mob,user_salt=:salt,user_email_conf=:active,user_image=:img,city_id=:cty " + + "set user_name=:name,user_surname=:sur,user_pass=:pass,user_email=:email,user_mobile=:mob,user_salt=:salt,user_active=:active,user_image=:img,city_id=:cty,user_role=:role,user_rtoken=:rtoken,user_rtoken_exp=:rtoken_exp,clazz_=:clazz_ " + "where user_id=:id" ) @@ -72,5 +93,9 @@ @NonNull @Param("active") Boolean active, @NonNull @Param("img") String image, - @NonNull @Param("cty") Long city_id); + @NonNull @Param("cty") Integer city_id, + @NonNull @Param("role") String role, + @NonNull @Param("rtoken") String rtoken, + @NonNull @Param("rtoken_exp") LocalDateTime rtoken_exp, + @NonNull @Param("clazz_") String clazz_); @Modifying @@ -86,7 +111,12 @@ @Query( nativeQuery = true, - value = "select * " + - "from users " + - "where user_email like :email" + value = """ + select * + from users u + left join customer c on u.user_id = c.user_id + left join driver d on u.user_id = d.user_id + left join manager m on u.user_id = m.user_id + where user_email like :email + """ ) Optional findUserByUserEmailIgnoreCase(@NonNull @Param("email") String email); @@ -94,7 +124,9 @@ @Query( nativeQuery = true, - value = "select * " + - "from users " + - "where user_email:email and user_pass=:pass" + value = """ + select * + from users + where user_email:email and user_pass=:pass + """ ) Optional findUserByUserNameAndUserPassword( @@ -108,3 +140,13 @@ Optional findUserByUserName( @NonNull @Param("email") String username); + + @Query( + nativeQuery = true, + value = """ + select * from users where user_rtoken=:token + """ + ) + Optional findUserByResetToken(@NonNull @Param("token") String token); + + Optional findUsersByUserEmailIgnoreCase(String email); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,8 +2,10 @@ import lombok.NonNull; +import mk.ukim.finki.db.distributorapp.model.dto.VehicleBasicDto; import mk.ukim.finki.db.distributorapp.model.entities.Vehicle; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; @@ -24,4 +26,16 @@ ) List findAllByWarehouse(@NonNull Integer warehouseId); + + @Query( + nativeQuery = true, + value = """ + select veh_id as id, + wh_id as warehouseId, + veh_plate as plateNumber + from vehicle + where wh_id = ?1 + """ + ) + List findAllByWarehouseDto(@NonNull Integer warehouseId); @Query( @@ -77,3 +91,18 @@ ) void delete(@NonNull Integer id); + + //---------------------------------------------------------------------------------------------------------------------- + @Query( + nativeQuery = true, + value = """ + select v.veh_plate,v.veh_reg + from warehouse w + join manager m on w.wh_id = m.wh_id + join vehicle v on w.wh_id=v.wh_id + where m.user_id=:manager + group by v.veh_plate, v.veh_reg + order by v.veh_reg + """ + ) + List getVehiclesByManager(@NonNull @Param("manager") Long managerId); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WarehouseRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WarehouseRepository.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WarehouseRepository.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,8 +2,11 @@ import lombok.NonNull; +import mk.ukim.finki.db.distributorapp.model.dto.WarehouseDto; +import mk.ukim.finki.db.distributorapp.model.entities.ArticleUnit; import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; @@ -20,13 +23,13 @@ @Query( nativeQuery = true, - value = "select * from warehouse where city_id=?1" + value = "select * from warehouse where city_id = ?1" ) - List findAllByCity(@NonNull Long city); + List findAllByCity(@NonNull Integer city); @Query( nativeQuery = true, - value = "select * from warehouse where wh_id=?1" + value = "select * from warehouse where wh_id = ?1" ) - Optional findById(@NonNull Short id); + Optional findById(@NonNull Integer id); @Modifying @@ -34,10 +37,10 @@ @Query( nativeQuery = true, - value = "insert into warehouse(wh_address, city_id) " + + value = "insert into warehouse(wh_adr, city_id) " + "values (?1,?2)" ) Integer create( @NonNull String whAddress, - @NonNull Long city); + @NonNull Integer city); @Modifying @@ -46,11 +49,11 @@ nativeQuery = true, value = "update warehouse " + - "set wh_address=?2,city_id=?3 " + - "where wh_id=?1" + "set wh_adr = ?2,city_id = ?3 " + + "where wh_id = ?1" ) Integer edit( @NonNull Integer id, @NonNull String whAddress, - @NonNull Long city); + @NonNull Integer city); @Modifying @@ -58,6 +61,56 @@ @Query( nativeQuery = true, - value = "delete from warehouse where wh_id=?1" + value = "delete from warehouse where wh_id = ?1" ) void delete(@NonNull Integer id); + //------------------------------------------------------------------------------------------------------------------- + + @Query( + nativeQuery = true, + value = """ + select a.art_name, man.man_name, count(a.art_id) as total_units + from warehouse w + join manager m on m.wh_id = w.wh_id + join article_unit au on au.wh_id = w.wh_id + join unit_price up on au.unit_id = up.unit_id + join price p on p.price_id=up.price_id + join article a on p.art_id=a.art_id + join article a on au = a.art_id + join manufacturer man on a.man_id = man.man_id + where m.user_id = :manager + group by a.art_name, man.man_name + order by total_units + """ + ) + List getInventoryByManager(@NonNull @Param("manager") Long manager_id); + + @Query( + nativeQuery = true, + value = """ + select * from warehouse w where w.city_id = ?1 + """ + ) + Warehouse findWarehouseByCityId(Integer id); + + @Query( + nativeQuery = true, + value = """ + with reg as ( + select r.* + from city c1 join region r on c1.region_id = r.region_id + where c1.city_id = :city + ) + select w.wh_id as id, + w.wh_adr as address, + c.city_id as cityId, + c.city_name as cityName, + r1.region_id as regionId, + r1.region_name as regionName + from warehouse w + join city c on c.city_id = w.city_id + join reg r1 on r1.region_id = c.region_id + where c.region_id = r1.region_id + """ + ) + WarehouseDto findWarehouseDtoByCityId(@NonNull @Param("city") Integer cityId); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/ConfirmationToken.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/ConfirmationToken.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/ConfirmationToken.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -18,5 +18,5 @@ public class ConfirmationToken { @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "t_id") private Long tokenId; @@ -29,4 +29,5 @@ @OneToOne(targetEntity = Users.class, fetch = FetchType.EAGER) + @JoinColumn(name = "t_user", referencedColumnName = "user_id", nullable = false, unique = true) private Users user; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUserDetailsService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUserDetailsService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUserDetailsService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,55 @@ +package mk.ukim.finki.db.distributorapp.security; + +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.entities.Users; +import mk.ukim.finki.db.distributorapp.repository.CustomerRepository; +import mk.ukim.finki.db.distributorapp.repository.DriverRepository; +import mk.ukim.finki.db.distributorapp.repository.ManagerRepository; +import mk.ukim.finki.db.distributorapp.repository.UsersRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Objects; + +@Service +@RequiredArgsConstructor +public class CustomUserDetailsService implements UserDetailsService { + + private final UsersRepository usersRepository; + private final CustomerRepository customerRepository; + private final ManagerRepository managerRepository; + private final DriverRepository driverRepository; + @Autowired + @Lazy + private InMemoryUserDetailsManager inMemoryUserDetailsManager; + + @Override + @Transactional + public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { + + if ("superuser@admin.com".equalsIgnoreCase(email)) { + return inMemoryUserDetailsManager.loadUserByUsername(email); + } + + Users user = this.usersRepository.findUsersByUserEmailIgnoreCase(email) + .orElseThrow(() -> new UsernameNotFoundException(email)); + + if(Objects.equals(user.getClazz_(), "CUSTOMER")){ + return this.customerRepository.findById(user.getUserId()) + .orElseThrow(() -> new UsernameNotFoundException(email)); + }else if(Objects.equals(user.getClazz_(), "MANAGER")){ + return this.managerRepository.findById(user.getUserId()) + .orElseThrow(() -> new UsernameNotFoundException(email)); + } else if(Objects.equals(user.getClazz_(), "DRIVER")){ + return this.driverRepository.findById(user.getUserId()) + .orElseThrow(() -> new UsernameNotFoundException(email)); + } + return user; + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUsernamePasswordAuthenticationProvider.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUsernamePasswordAuthenticationProvider.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUsernamePasswordAuthenticationProvider.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,40 @@ +package mk.ukim.finki.db.distributorapp.security; + +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.service.UsersService; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class CustomUsernamePasswordAuthenticationProvider implements AuthenticationProvider { + + private final UsersService usersService; + private final CustomUserDetailsService customUserDetailsService; + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + String email = authentication.getName(); + String password = authentication.getCredentials().toString(); + + if("".equals(email)||"".equals(password)){ + throw new BadCredentialsException("Invalid email or password"); + } + + UserDetails userDetails = this.customUserDetailsService.loadUserByUsername(email); + String salt = this.usersService.findUserByEmail(email).getUserSalt(); + if(!PassEncryption.verifyUserPassword(password, userDetails.getPassword(), salt)) + throw new BadCredentialsException("Invalid password"); + return new UsernamePasswordAuthenticationToken(userDetails,userDetails.getPassword(), userDetails.getAuthorities()); + } + + @Override + public boolean supports(Class aClass) { + return aClass.equals(UsernamePasswordAuthenticationToken.class); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/PassEncryption.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/PassEncryption.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/PassEncryption.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -42,5 +42,5 @@ public static String generateSecurePassword(String password, String salt) { - String res = null; + String res; byte[] securePassword = hash(password.toCharArray(), salt.getBytes()); @@ -50,6 +50,6 @@ public static boolean verifyUserPassword(String providedPassword, String securedPassword, String salt) { - boolean res = false; - String newSecuredPassword = generateSecurePassword(securedPassword, salt); + boolean res; + String newSecuredPassword = generateSecurePassword(providedPassword, salt); res = newSecuredPassword.equals(securedPassword); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/PassEncryptionPasswordEncoder.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/PassEncryptionPasswordEncoder.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/PassEncryptionPasswordEncoder.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -3,4 +3,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Component; + +import static mk.ukim.finki.db.distributorapp.security.PassEncryption.generateSecurePassword; +import static mk.ukim.finki.db.distributorapp.security.PassEncryption.verifyUserPassword; @Component @@ -9,20 +12,18 @@ @Override public String encode(CharSequence rawPassword) { - // Generate a new salt and hash the password throw new UnsupportedOperationException("Salt must be provided explicitly!"); } public String encodeWithSalt(CharSequence rawPassword, String salt) { - return PassEncryption.generateSecurePassword(rawPassword.toString(), salt); + return generateSecurePassword(rawPassword.toString(), salt); } @Override public boolean matches(CharSequence rawPassword, String encodedPassword) { - // Split stored password into salt and hash throw new UnsupportedOperationException("Use matchesWithSalt for explicit salt verification!"); } public boolean matchesWithSalt(CharSequence rawPassword, String encodedPassword, String salt) { - return PassEncryption.verifyUserPassword(rawPassword.toString(), encodedPassword, salt); + return verifyUserPassword(rawPassword.toString(), encodedPassword, salt); } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/SecurityConfig.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/SecurityConfig.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/SecurityConfig.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,92 @@ +package mk.ukim.finki.db.distributorapp.security; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SecurityConfig { + + private final CustomUsernamePasswordAuthenticationProvider authenticationProvider; + private final SuperUserAuthenticationProvider superUserAuthenticationProvider; + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http + .authorizeHttpRequests(auth -> auth + .requestMatchers("/auth/**", "/rest/auth/**", "/reset-password/**", "/css/**", "/js/**").permitAll() + .requestMatchers("/admin/**").hasRole("ADMIN") + .requestMatchers("/customer/**").hasAnyRole("CUSTOMER", "ADMIN") + .requestMatchers("/manager/**").hasAnyRole("MANAGER", "ADMIN") + .requestMatchers("/driver/**").hasAnyRole("DRIVER","ADMIN") + .anyRequest() + .authenticated() + ) + .formLogin(login -> login + .loginPage("/auth/login") + .loginProcessingUrl("/auth/login") + .usernameParameter("email") + .passwordParameter("password") + .defaultSuccessUrl("/home", true) + .failureUrl("/auth/login?error=true") + .permitAll() + ) + .logout(logout -> logout + .logoutUrl("/logout") + .logoutSuccessUrl("/login?logout") + .clearAuthentication(true) + .invalidateHttpSession(true) + .deleteCookies("JSESSIONID") + .logoutSuccessUrl("/") + .permitAll() + ) + .exceptionHandling((ex) -> ex + .accessDeniedPage("/access-denied")) + .csrf(AbstractHttpConfigurer::disable); + + return http.build(); + } + + @Bean + public InMemoryUserDetailsManager inMemoryUserDetailsManager() { + PasswordEncoder standardEncoder = new BCryptPasswordEncoder(); + UserDetails superUser = User.withUsername("superuser@admin.com") + .password(standardEncoder.encode("supersecret")) + .roles("ADMIN") + .build(); + return new InMemoryUserDetailsManager(superUser); + } + + @Bean + public AuthenticationManager authenticationManager( + HttpSecurity http + ) throws Exception + { + AuthenticationManagerBuilder authenticationManagerBuilder = + http.getSharedObject(AuthenticationManagerBuilder.class); + + authenticationManagerBuilder.authenticationProvider(superUserAuthenticationProvider); + authenticationManagerBuilder.authenticationProvider(authenticationProvider); + + return authenticationManagerBuilder.build(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new PassEncryptionPasswordEncoder(); + } + +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/SuperUserAuthenticationProvider.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/SuperUserAuthenticationProvider.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/SuperUserAuthenticationProvider.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,46 @@ +package mk.ukim.finki.db.distributorapp.security; + +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Component; + +@Component +public class SuperUserAuthenticationProvider implements AuthenticationProvider { + + private static final String SUPERUSER_ENCODED_PASSWORD = "$2a$12$KC9Z0kHyu06iV4xlpKOgL.p2KH3NS9EY/N3g97nGAtC/NCpRXVgXa"; // example value + + private final PasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + String username = authentication.getName(); + String rawPassword = authentication.getCredentials().toString(); + + if (!"superuser@admin.com".equalsIgnoreCase(username)) { + return null; + } + + if (!passwordEncoder.matches(rawPassword, SUPERUSER_ENCODED_PASSWORD)) { + throw new BadCredentialsException("Invalid superuser credentials"); + } + + UserDetails superUser = User.withUsername("superuser@admin.com") + .password(SUPERUSER_ENCODED_PASSWORD) + .roles("ADMIN") + .build(); + + return new UsernamePasswordAuthenticationToken(superUser, superUser.getPassword(), superUser.getAuthorities()); + } + + @Override + public boolean supports(Class authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,15 +1,93 @@ package mk.ukim.finki.db.distributorapp.security.auth; -import mk.ukim.finki.db.distributorapp.service.UsersService; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletRequest; +import mk.ukim.finki.db.distributorapp.model.dto.CityDtoRegister; +import mk.ukim.finki.db.distributorapp.model.dto.LoginRequestDto; +import mk.ukim.finki.db.distributorapp.model.dto.RegisterRequestDto; +import mk.ukim.finki.db.distributorapp.model.entities.Users; +import mk.ukim.finki.db.distributorapp.model.exceptions.InvalidUserCredentialsException; +import mk.ukim.finki.db.distributorapp.service.CityService; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; -@RestController +import java.util.List; + +@Controller @RequestMapping("/auth") public class AuthController { - private final UsersService usersService; - public AuthController(UsersService usersService) { - this.usersService = usersService; + private final CityService cityService; + private final AuthService authService; + + public AuthController(CityService cityService, AuthService authService) { + this.cityService = cityService; + this.authService = authService; + } + + @GetMapping("/login") + public String login(@RequestParam(value = "error", required = false) String error, Model model) { + if (error != null) { + model.addAttribute("error", "Invalid username or password"); + } + return "authentication/login"; + } + + @PostMapping("/login") + public String login(@ModelAttribute LoginRequestDto loginRequest, RedirectAttributes redirectAttributes) { + try{ + Users user = authService.login(loginRequest); + + switch (user.getUserRole()){ + case ROLE_CUSTOMER -> { + return "redirect:/home/customer"; + } + case ROLE_ADMIN -> { + return "redirect:/home/admin"; + } + case ROLE_MANAGER -> { + return "redirect:/home/manager"; + } + case ROLE_DRIVER -> { + return "redirect:/home/driver"; + } + default -> { + return "redirect:/home"; + } + } + }catch (InvalidUserCredentialsException e) { + redirectAttributes.addFlashAttribute("error", "Invalid credentials."); + return "redirect:/auth/login"; + } + } + + @GetMapping("/register") + public String registerCustomer(Model model) { + List cities = this.cityService.findAllCityDtos(); + model.addAttribute("cities", cities); + return "authentication/register"; + } + + @PostMapping("/register") + public String register(@ModelAttribute RegisterRequestDto registerRequest) throws Exception { + authService.register(registerRequest); + return "redirect:/auth/login"; + } + + @GetMapping("/changePass") + public String changePassword(Model model) { + return "authentication/changePass"; + } + + @GetMapping("/logout") + public String logout(HttpServletRequest req) { + req.getSession().invalidate(); + return "redirect:/auth/login"; + } + + @PostMapping("/logout") + public String logout(Model model){ + return "redirect:/auth/login"; } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,5 +1,8 @@ package mk.ukim.finki.db.distributorapp.security.auth; -import mk.ukim.finki.db.distributorapp.model.entities.City; +import mk.ukim.finki.db.distributorapp.model.dto.CreateDriverDto; +import mk.ukim.finki.db.distributorapp.model.dto.CreateManagerDto; +import mk.ukim.finki.db.distributorapp.model.dto.LoginRequestDto; +import mk.ukim.finki.db.distributorapp.model.dto.RegisterRequestDto; import mk.ukim.finki.db.distributorapp.model.entities.Users; import org.springframework.http.ResponseEntity; @@ -14,7 +17,10 @@ ResponseEntity confirmEmail(String confirmationToken); - Users register(String name, String surname, String email, - String password, String mobile, String image, City city); + void register(RegisterRequestDto registerRequest) throws Exception; - Users login(String username, String password); + void createManager(CreateManagerDto createUserDto) throws Exception; + + void createDriver(CreateDriverDto createDriverDto) throws Exception; + + Users login(LoginRequestDto loginRequest); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,10 +1,14 @@ package mk.ukim.finki.db.distributorapp.security.auth; -import mk.ukim.finki.db.distributorapp.model.entities.City; +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.dto.CreateDriverDto; +import mk.ukim.finki.db.distributorapp.model.dto.CreateManagerDto; +import mk.ukim.finki.db.distributorapp.model.dto.LoginRequestDto; +import mk.ukim.finki.db.distributorapp.model.dto.RegisterRequestDto; import mk.ukim.finki.db.distributorapp.model.entities.Users; +import mk.ukim.finki.db.distributorapp.model.enumerations.Role; import mk.ukim.finki.db.distributorapp.model.exceptions.InvalidArgumentsException; import mk.ukim.finki.db.distributorapp.model.exceptions.InvalidUserCredentialsException; -import mk.ukim.finki.db.distributorapp.repository.ConfirmationTokenRepository; -import mk.ukim.finki.db.distributorapp.repository.UsersRepository; +import mk.ukim.finki.db.distributorapp.repository.*; import mk.ukim.finki.db.distributorapp.security.ConfirmationToken; import mk.ukim.finki.db.distributorapp.security.EmailService; @@ -14,8 +18,10 @@ import org.springframework.mail.SimpleMailMessage; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Optional; @Service +@RequiredArgsConstructor public class AuthServiceImpl implements AuthService { @@ -24,11 +30,7 @@ private final EmailService emailService; private final PassEncryptionPasswordEncoder passwordEncoder; - - public AuthServiceImpl(UsersRepository usersRepository, ConfirmationTokenRepository confirmationTokenRepository, EmailService emailService, PassEncryptionPasswordEncoder passwordEncoder) { - this.usersRepository = usersRepository; - this.confirmationTokenRepository = confirmationTokenRepository; - this.emailService = emailService; - this.passwordEncoder = passwordEncoder; - } + private final CustomerRepository customerRepository; + private final ManagerRepository managerRepository; + private final DriverRepository driverRepository; @Override @@ -56,10 +58,28 @@ @Override - public Users register(String name, String surname, String email, String password, String mobile, String image, City city) { + @Transactional + public void register(RegisterRequestDto registerRequest) throws Exception { String saltValue = PassEncryption.genSaltValue(30); - String safePass = passwordEncoder.encodeWithSalt(password, saltValue); + String safePass = passwordEncoder.encodeWithSalt(registerRequest.getPassword(), saltValue); - this.usersRepository.create(name, surname, safePass, email, mobile, saltValue, false, image, city.getCityId()); - Users user = this.usersRepository.findUserByUserEmailIgnoreCase(email).orElseThrow(InvalidUserCredentialsException::new); + Integer res = this.usersRepository.create( + registerRequest.getName(), + registerRequest.getSurname(), + safePass, + registerRequest.getEmail(), + registerRequest.getMobile(), + saltValue, + false, + null, + registerRequest.getCity(), + Role.ROLE_CUSTOMER.name(), + null, + null, + "CUSTOMER"); + if (res == 0) { + throw new Exception("User insertion failed"); + } + + Users user = this.usersRepository.findUserByUserEmailIgnoreCase(registerRequest.getEmail()).orElseThrow(InvalidUserCredentialsException::new); ConfirmationToken confirmationToken = new ConfirmationToken(user); @@ -67,5 +87,5 @@ SimpleMailMessage mailMessage = new SimpleMailMessage(); - mailMessage.setTo(email); + mailMessage.setTo(registerRequest.getEmail()); mailMessage.setSubject("Complete Registration!"); mailMessage.setText(("To confirm your account, please click here: " + @@ -74,16 +94,98 @@ emailService.sendEmail(mailMessage); - return user; + this.customerRepository.create( + user.getUserId(), + registerRequest.getEdb(), + registerRequest.getName(), + registerRequest.getAddress(), + registerRequest.getProfileImage()); } @Override - public Users login(String username, String password) { - if (username == null || username.isEmpty() || password == null || password.isEmpty()) { + @Transactional + public void createManager(CreateManagerDto createManagerDto) throws Exception { + String saltValue = PassEncryption.genSaltValue(30); + String safePass = passwordEncoder.encodeWithSalt(createManagerDto.getPassword(), saltValue); + + Integer res = this.usersRepository.create( + createManagerDto.getName(), + createManagerDto.getSurname(), + safePass, + createManagerDto.getEmail(), + createManagerDto.getMobile(), + saltValue, + false, + null, + createManagerDto.getCity(), + Role.ROLE_MANAGER.name(), + null, + null, + "MANAGER"); + + if (res == 0) { + throw new Exception("User insertion failed"); + } + + Users user = this.usersRepository.findUserByUserEmailIgnoreCase(createManagerDto.getEmail()).orElseThrow(InvalidUserCredentialsException::new); + this.managerRepository.create( + user.getUserId(), + createManagerDto.getWarehouseId() + ); + } + + @Override + @Transactional + public void createDriver(CreateDriverDto createDriverDto) throws Exception{ + String saltValue = PassEncryption.genSaltValue(30); + String safePass = passwordEncoder.encodeWithSalt(createDriverDto.getPassword(), saltValue); + + Integer res = this.usersRepository.create( + createDriverDto.getName(), + createDriverDto.getSurname(), + safePass, + createDriverDto.getEmail(), + createDriverDto.getMobile(), + saltValue, + false, + null, + createDriverDto.getCity(), + Role.ROLE_DRIVER.name(), + null, + null, + "DRIVER"); + + if (res == 0) { + throw new Exception("User insertion failed"); + } + + Users user = this.usersRepository.findUserByUserEmailIgnoreCase(createDriverDto.getEmail()).orElseThrow(InvalidUserCredentialsException::new); + this.driverRepository.create( + user.getUserId(), + createDriverDto.getVehicle() + ); + } + + @Override + @Transactional + public Users login(LoginRequestDto loginRequest) { + if (loginRequest.getEmail() == null + || loginRequest.getEmail().isEmpty() + || loginRequest.getPassword() == null + || loginRequest.getPassword().isEmpty()) { + throw new InvalidArgumentsException(); } - String secPassword = passwordEncoder.encodeWithSalt(password, usersRepository.findUserByUserName(username).get().getUserSalt()); + Users user = this.usersRepository.findUsersByUserEmailIgnoreCase(loginRequest.getEmail()) + .orElseThrow(InvalidUserCredentialsException::new); - return usersRepository.findUserByUserNameAndUserPassword(username, secPassword).orElseThrow(InvalidUserCredentialsException::new); + String secPassword = passwordEncoder + .encodeWithSalt(loginRequest.getPassword(), user.getUserSalt()); + + if (!secPassword.equals(user.getPassword())) { + throw new InvalidUserCredentialsException(); + } + + return user; } } Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/LoginController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/LoginController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,39 +1,0 @@ -//package mk.ukim.finki.db.distributorapp.web; -// -//import jakarta.servlet.http.HttpServletRequest; -//import mk.ukim.finki.db.distributorapp.model.entities.Users; -//import mk.ukim.finki.db.distributorapp.model.exceptions.InvalidUserCredentialsException; -//import mk.ukim.finki.db.distributorapp.service.UsersService; -//import org.springframework.stereotype.Controller; -//import org.springframework.ui.Model; -//import org.springframework.web.bind.annotation.GetMapping; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestMapping; -// -//@Controller -//@RequestMapping("/login") -//public class LoginController { -// private final UsersService usersService; -// -// public LoginController(UsersService usersService) { -// this.usersService = usersService; -// } -// -// @GetMapping -// public String getLoginPage() { -// return "login"; -// } -// -// @PostMapping -// public String login(HttpServletRequest req, Model model) { -// Users user = null; -// try { -// user = this.usersService.login(req.getParameter("email"), req.getParameter("password")); -// return "redirect:/home"; -// } catch (InvalidUserCredentialsException e) { -// model.addAttribute("hasError", true); -// model.addAttribute("error", e.getMessage()); -// return "login"; -// } -// } -//} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/PasswordResetController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/PasswordResetController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/PasswordResetController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,105 @@ +package mk.ukim.finki.db.distributorapp.security.auth; + +import mk.ukim.finki.db.distributorapp.model.dto.UserDto; +import mk.ukim.finki.db.distributorapp.model.entities.Users; +import mk.ukim.finki.db.distributorapp.security.EmailService; +import mk.ukim.finki.db.distributorapp.security.PassEncryptionPasswordEncoder; +import mk.ukim.finki.db.distributorapp.service.UsersService; +import org.springframework.mail.SimpleMailMessage; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.time.LocalDateTime; +import java.util.UUID; + +@Controller +@RequestMapping("/reset-password") +public class PasswordResetController { + private final UsersService usersService; + private final EmailService emailService; + private final PassEncryptionPasswordEncoder passwordEncoder; + + public PasswordResetController(UsersService usersService, EmailService emailService, PassEncryptionPasswordEncoder passwordEncoder) { + this.usersService = usersService; + this.emailService = emailService; + this.passwordEncoder = passwordEncoder; + } + + @GetMapping("/request") + public String resetPasswordRequest() { + return "authentication/reset-password-request"; + } + + @PostMapping("/reset-password-request") + public String resetPasswordRequest(@RequestParam("email") String email, Model model) { + + Users user = this.usersService.findUserByEmail(email); + if(user==null){ + model.addAttribute("error", "No user found with this email."); + return "authentication/reset-password-request"; + } + + String token = UUID.randomUUID().toString(); + user.setUserResetToken(token); + user.setUserResetTokenExpiry(LocalDateTime.now().plusHours(1)); + + UserDto dto = this.usersService.buildDto(user); + this.usersService.edit(dto); + + String resetLink = "https://localhost:8080/reset-password?token=" + token; + String emailBody = "Click the link to reset your password: " + resetLink; + + SimpleMailMessage message = new SimpleMailMessage(); + message.setTo(email); + message.setSubject("Password Reset Request"); + message.setText(emailBody); + emailService.sendEmail(message); + + model.addAttribute("success", "A password link has been sent to your email."); + return "authentication/reset-password-request"; + } + + @GetMapping("/reset-password") + public String showResetPasswordForm(@RequestParam("token") String token, Model model){ + + Users user = usersService.findUserByResetToken(token); + if(user==null || user.getUserResetTokenExpiry().isBefore(LocalDateTime.now())){ + model.addAttribute("error", "Invalid or expired token."); + return "authentication/reset-password"; + } + model.addAttribute("token", token); + return "authentication/reset-password"; + } + + @PostMapping("/reset-password") + public String handleResetPassword( + @RequestParam("token") String token, + @RequestParam("newPassword") String newPassword, + @RequestParam("confirmPassword") String confirmPassword, + Model model){ + + Users user = this.usersService.findUserByResetToken(token); + if (user == null || user.getUserResetTokenExpiry().isBefore(LocalDateTime.now())) { + model.addAttribute("error", "Invalid or expired token."); + return "authentication/reset-password"; + } + + if(!newPassword.equals(confirmPassword)){ + model.addAttribute("error", "Passwords do not match."); + return "authentication/reset-password"; + } + + user.setUserPassword(passwordEncoder.encodeWithSalt(newPassword,user.getUserSalt())); + user.setUserResetToken(null); + user.setUserResetTokenExpiry(null); + UserDto dto = this.usersService.buildDto(user); + this.usersService.edit(dto); + + model.addAttribute("success", "Your password has been reset successfully."); + return "authentication/reset-password"; + } +} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/RegisterController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/RegisterController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,55 +1,0 @@ -//package mk.ukim.finki.db.distributorapp.web; -// -//import mk.ukim.finki.db.distributorapp.model.entities.City; -//import mk.ukim.finki.db.distributorapp.model.exceptions.InvalidArgumentsException; -//import mk.ukim.finki.db.distributorapp.service.CityService; -//import mk.ukim.finki.db.distributorapp.service.UsersService; -//import org.springframework.stereotype.Controller; -//import org.springframework.ui.Model; -//import org.springframework.web.bind.annotation.GetMapping; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -// -//@Controller -//@RequestMapping("/register") -//public class RegisterController { -// private final UsersService usersService; -// private final CityService cityService; -// -// public RegisterController(UsersService usersService, CityService cityService) { -// this.usersService = usersService; -// this.cityService = cityService; -// } -// -// @GetMapping -// public String getRegisterPage(@RequestParam(required = false) String error, Model model) { -// if (error != null && !error.isEmpty()) { -// model.addAttribute("hasError", true); -// model.addAttribute("error", error); -// } -// -// model.addAttribute("bodyContent", "register"); -// model.addAttribute("cities", cityService.listCities()); -// return "register"; -// } -// -// @PostMapping -// public String register( -// @RequestParam String email, -// @RequestParam String password, -// @RequestParam String repeatedPassword, -// @RequestParam String name, -// @RequestParam String surname, -// @RequestParam String mobile, -// @RequestParam Long city -// ) { -// try { -// City selectedCity = this.cityService.getCityObjById(city).get(); -// this.usersService.register(name, surname, email, password, repeatedPassword, mobile, selectedCity); -// return "redirect:/login"; -// } catch (InvalidArgumentsException exception) { -// return "redirect:/register?error=" + exception.getMessage(); -// } -// } -//} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/RestAuthController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/RestAuthController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/RestAuthController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,36 @@ +package mk.ukim.finki.db.distributorapp.security.auth; + +import mk.ukim.finki.db.distributorapp.model.dto.LoginRequestDto; +import mk.ukim.finki.db.distributorapp.model.dto.LoginResponseDto; +import mk.ukim.finki.db.distributorapp.model.dto.RegisterRequestDto; +import mk.ukim.finki.db.distributorapp.model.entities.Users; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/rest/auth") +public class RestAuthController { + + private final AuthService authService; + + public RestAuthController(AuthService authService) { + this.authService = authService; + } + + @PostMapping("/login") + public ResponseEntity login(@ModelAttribute LoginRequestDto loginRequest) { + Users user = authService.login(loginRequest); + return ResponseEntity.ok(new LoginResponseDto(user.getUserEmail())); + } + + @PostMapping("/register") + public ResponseEntity register(@ModelAttribute RegisterRequestDto registerRequest) throws Exception { + authService.register(registerRequest); + return ResponseEntity.status(HttpStatus.CREATED).body("User registered successfully"); + } + +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CityService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CityService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CityService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.CityDto; +import mk.ukim.finki.db.distributorapp.model.dto.CityDtoRegister; import mk.ukim.finki.db.distributorapp.model.entities.City; @@ -9,9 +10,13 @@ public interface CityService { + List listCitiesObj(); + List listCities(); - CityDto getCityById(Long id); + List findAllCityDtos(); - Optional getCityObjById(Long id); + CityDto getCityById(Integer id); + + Optional getCityObjById(Integer id); Integer create(CityDto cityDto); @@ -19,5 +24,5 @@ Integer edit(CityDto cityDto); - void deleteById(Long id); + void deleteById(Integer id); List searchCities(String text); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,4 +2,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.CustomerDto; +import mk.ukim.finki.db.distributorapp.model.entities.Customer; import java.util.List; @@ -13,4 +14,6 @@ CustomerDto findCustomerById(Long id); + Customer getCustomerObjById(Long id); + Integer create(CustomerDto customerDto); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,5 +2,7 @@ import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; +import mk.ukim.finki.db.distributorapp.model.entities.Customer; import mk.ukim.finki.db.distributorapp.model.entities.Driver; +import mk.ukim.finki.db.distributorapp.model.entities.Manager; import mk.ukim.finki.db.distributorapp.model.entities.Vehicle; @@ -21,3 +23,9 @@ void deleteById(Long del_id); + + List getAllNewDeliveriesByDriver(Driver driver); + + List getCurrentDeliveriesByCustomer (Customer customer); + + List getCurrentDeliveriesByManager (Manager manager); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,8 +2,10 @@ import mk.ukim.finki.db.distributorapp.model.dto.DriverDto; +import mk.ukim.finki.db.distributorapp.model.entities.Driver; import java.util.List; public interface DriverService { + List getAllDrivers(); @@ -11,4 +13,6 @@ DriverDto findById(Long id); + + Driver getDriverObjById(Long id); Integer create(DriverDto driverDto); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManagerService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManagerService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManagerService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -2,11 +2,15 @@ import mk.ukim.finki.db.distributorapp.model.dto.ManagerDto; +import mk.ukim.finki.db.distributorapp.model.entities.Manager; import java.util.List; public interface ManagerService { + List getAllManagers(); - ManagerDto getManagerById(int id); + ManagerDto getManagerById(Long id); + + Manager getManagerByIdObj(Long id); Integer create(ManagerDto managerDto); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -3,4 +3,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.OrdersDto; import mk.ukim.finki.db.distributorapp.model.entities.Customer; +import mk.ukim.finki.db.distributorapp.model.entities.Manager; import java.util.List; @@ -18,3 +19,7 @@ void deleteById(Long id); + + List findCurrentOrdersByCustomer(Customer customer); + + List getNewOrdersByManager(Manager manager); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/RegionService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/RegionService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/RegionService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -17,4 +17,6 @@ Integer edit(RegionDto regionDto); + RegionDto getRegionByCityId(Integer cityId); + void deleteById(Integer id); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/UsersService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/UsersService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/UsersService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service; +import mk.ukim.finki.db.distributorapp.model.dto.UserDto; import mk.ukim.finki.db.distributorapp.model.entities.Users; @@ -7,5 +8,9 @@ public interface UsersService { List findAllUsers(); - - + Users findUserById(Long id); + Users findUserByEmail(String email); + Integer edit(UserDto userDto); + Integer deleteUserById(Long id); + UserDto buildDto(Users user); + Users findUserByResetToken(String token); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/VehicleService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/VehicleService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/VehicleService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,6 +1,7 @@ package mk.ukim.finki.db.distributorapp.service; +import mk.ukim.finki.db.distributorapp.model.dto.VehicleBasicDto; import mk.ukim.finki.db.distributorapp.model.dto.VehicleDto; -import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; +import mk.ukim.finki.db.distributorapp.model.entities.Manager; import java.util.List; @@ -10,5 +11,5 @@ List getAllVehicles(); - List getVehiclesByWarehouse(Warehouse warehouse); + List getVehiclesByWarehouse(Integer warehouseId); Integer create(VehicleDto vehicleDto); @@ -17,3 +18,5 @@ void deleteById(Integer id); + + List getVehiclesByManager(Manager manager); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WarehouseService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WarehouseService.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WarehouseService.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -3,4 +3,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.WarehouseDto; import mk.ukim.finki.db.distributorapp.model.entities.City; +import mk.ukim.finki.db.distributorapp.model.entities.Manager; import java.util.List; @@ -13,4 +14,6 @@ WarehouseDto findById(Integer id); + WarehouseDto findByCityId(Integer id); + Integer create(WarehouseDto warehouseDto); @@ -18,3 +21,7 @@ void deleteById(Integer id); + + List getInventoryByManager(Manager manager); + + } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.ArticleDto; import mk.ukim.finki.db.distributorapp.model.entities.Article; @@ -10,10 +11,7 @@ @Service +@RequiredArgsConstructor public class ArticleServiceImpl implements ArticleService { private final ArticleRepository articleRepository; - - public ArticleServiceImpl(ArticleRepository articleRepository) { - this.articleRepository = articleRepository; - } @Override Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleUnitServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleUnitServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleUnitServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.ArticleUnitDto; import mk.ukim.finki.db.distributorapp.model.dto.UnitPriceDto; @@ -17,4 +18,5 @@ @Service +@RequiredArgsConstructor public class ArticleUnitServiceImpl implements ArticleUnitService { private final ArticleUnitRepository articleUnitRepository; @@ -22,11 +24,4 @@ private final UnitPriceRepository unitPriceRepository; private final PriceRepository priceRepository; - - public ArticleUnitServiceImpl(ArticleUnitRepository articleUnitRepository, WarehouseRepository warehouseRepository, UnitPriceRepository unitPriceRepository, PriceRepository priceRepository) { - this.articleUnitRepository = articleUnitRepository; - this.warehouseRepository = warehouseRepository; - this.unitPriceRepository = unitPriceRepository; - this.priceRepository = priceRepository; - } private List buildDto(List articleUnits) { Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CategoryServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CategoryServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CategoryServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.CategoryDto; import mk.ukim.finki.db.distributorapp.model.entities.Category; @@ -11,11 +12,8 @@ @Service +@RequiredArgsConstructor public class CategoryServiceImpl implements CategoryService { private final CategoryRepository categoryRepository; - public CategoryServiceImpl(CategoryRepository categoryRepository) { - this.categoryRepository = categoryRepository; - - } private List buildDto(List categories) { Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CityServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CityServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CityServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,5 +1,7 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.CityDto; +import mk.ukim.finki.db.distributorapp.model.dto.CityDtoRegister; import mk.ukim.finki.db.distributorapp.model.entities.City; import mk.ukim.finki.db.distributorapp.repository.CityRepository; @@ -12,10 +14,7 @@ @Service +@RequiredArgsConstructor public class CityServiceImpl implements CityService { private final CityRepository cityRepository; - - public CityServiceImpl(CityRepository cityRepository) { - this.cityRepository = cityRepository; - } private List buildDto(List cities) { @@ -34,4 +33,9 @@ @Override + public List listCitiesObj() { + return cityRepository.listAll(); + } + + @Override public List listCities() { List cities = cityRepository.listAll(); @@ -40,8 +44,12 @@ @Override - public CityDto getCityById(Long id) { - City city = cityRepository.findById(id).orElse(null); + public List findAllCityDtos() { + return this.cityRepository.findAllCityDtos(); + } - assert city != null; + @Override + public CityDto getCityById(Integer id) { + City city = cityRepository.findById(id).orElseThrow(); + return new CityDto( city.getCityId(), @@ -53,5 +61,5 @@ @Override - public Optional getCityObjById(Long id){ + public Optional getCityObjById(Integer id){ return this.cityRepository.findById(id); } @@ -68,5 +76,5 @@ @Override - public void deleteById(Long id) { + public void deleteById(Integer id) { this.cityRepository.deleteById(id); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.CustomerDto; import mk.ukim.finki.db.distributorapp.model.entities.Customer; @@ -11,11 +12,8 @@ @Service +@RequiredArgsConstructor public class CustomerServiceImpl implements CustomerService { private final CustomerRepository customerRepository; - - public CustomerServiceImpl(CustomerRepository customerRepository) { - this.customerRepository = customerRepository; - } private List buildDto(List customers) { @@ -65,4 +63,9 @@ @Override + public Customer getCustomerObjById(Long id) { + return this.customerRepository.findById(id).get(); + } + + @Override public Integer create(CustomerDto customerDto) { return this.customerRepository.create( Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerWeekdayServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerWeekdayServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerWeekdayServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.CustomerWeekdayDto; import mk.ukim.finki.db.distributorapp.model.entities.CustomerWeekday; @@ -11,10 +12,8 @@ @Service +@RequiredArgsConstructor public class CustomerWeekdayServiceImpl implements CustomerWeekdayService { private final CustomerWeekdayRepository customerWeekdayRepository; - public CustomerWeekdayServiceImpl(CustomerWeekdayRepository customerWeekdayRepository) { - this.customerWeekdayRepository = customerWeekdayRepository; - } private List buildDto(List customerWeekdays) { Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,26 +1,18 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; -import mk.ukim.finki.db.distributorapp.model.entities.Delivery; -import mk.ukim.finki.db.distributorapp.model.entities.DeliveryStatus; -import mk.ukim.finki.db.distributorapp.model.entities.Driver; -import mk.ukim.finki.db.distributorapp.model.entities.Vehicle; +import mk.ukim.finki.db.distributorapp.model.entities.*; import mk.ukim.finki.db.distributorapp.repository.DeliveryRepository; import mk.ukim.finki.db.distributorapp.service.DeliveryService; import org.springframework.stereotype.Service; -import java.time.LocalDate; -import java.time.LocalTime; import java.util.ArrayList; import java.util.List; -import java.util.Optional; @Service +@RequiredArgsConstructor public class DeliveryServiceImpl implements DeliveryService { private final DeliveryRepository deliveryRepository; - - public DeliveryServiceImpl(DeliveryRepository deliveryRepository) { - this.deliveryRepository = deliveryRepository; - } private List buildDto(List deliveries) { @@ -118,3 +110,21 @@ this.deliveryRepository.delete(del_id); } + + @Override + public List getAllNewDeliveriesByDriver(Driver driver) { + List deliveries = this.deliveryRepository.getNewDeliveriesByDriver(driver.getUserId()); + return buildDto(deliveries); + } + + @Override + public List getCurrentDeliveriesByCustomer(Customer customer) { + List deliveries = this.deliveryRepository.getCurrentDeliveriesByCustomer(customer.getUserId()); + return buildDto(deliveries); + } + + @Override + public List getCurrentDeliveriesByManager(Manager manager) { + List deliveries = this.deliveryRepository.getCurrentDeliveriesByManager(manager.getUserId()); + return buildDto(deliveries); + } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryStatusServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryStatusServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryStatusServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.DeliveryStatusDto; import mk.ukim.finki.db.distributorapp.model.entities.DeliveryStatus; @@ -11,10 +12,8 @@ @Service +@RequiredArgsConstructor public class DeliveryStatusServiceImpl implements DeliveryStatusService { private final DeliveryStatusRepository deliveryStatusRepository; - public DeliveryStatusServiceImpl(DeliveryStatusRepository deliveryStatusRepository) { - this.deliveryStatusRepository = deliveryStatusRepository; - } private List buildDto(List deliveryStatuses) { Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.DriverDto; import mk.ukim.finki.db.distributorapp.model.entities.Driver; @@ -11,10 +12,7 @@ @Service +@RequiredArgsConstructor public class DriverServiceImpl implements DriverService { private final DriverRepository driverRepository; - - public DriverServiceImpl(DriverRepository driverRepository) { - this.driverRepository = driverRepository; - } private List buildDto(List drivers) { @@ -60,4 +58,9 @@ @Override + public Driver getDriverObjById(Long id) { + return this.driverRepository.findById(id).get(); + } + + @Override public Integer create(DriverDto driverDto) { return this.driverRepository.create( Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManagerServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManagerServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManagerServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.ManagerDto; import mk.ukim.finki.db.distributorapp.model.entities.Manager; @@ -11,10 +12,8 @@ @Service +@RequiredArgsConstructor public class ManagerServiceImpl implements ManagerService { private final ManagerRepository managerRepository; - public ManagerServiceImpl(ManagerRepository managerRepository) { - this.managerRepository = managerRepository; - } private List buildDto(List managers) { @@ -43,5 +42,5 @@ @Override - public ManagerDto getManagerById(int id) { + public ManagerDto getManagerById(Long id) { Manager manager = this.managerRepository.findById(id).get(); @@ -56,4 +55,8 @@ manager.getWarehouse().getCity().getCityName() ); + } + + public Manager getManagerByIdObj(Long id){ + return this.managerRepository.findById(id).get(); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManufacturerServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManufacturerServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManufacturerServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.ManufacturerDto; import mk.ukim.finki.db.distributorapp.model.entities.Manufacturer; @@ -11,10 +12,8 @@ @Service +@RequiredArgsConstructor public class ManufacturerServiceImpl implements ManufacturerService { private final ManufacturerRepository manufacturerRepository; - public ManufacturerServiceImpl(ManufacturerRepository manufacturerRepository) { - this.manufacturerRepository = manufacturerRepository; - } private List buildDto(List manufacturers) { Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrderStatusServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrderStatusServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrderStatusServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.OrderStatusDto; import mk.ukim.finki.db.distributorapp.model.entities.OrderStatus; @@ -11,10 +12,7 @@ @Service +@RequiredArgsConstructor public class OrderStatusServiceImpl implements OrderStatusService { private final OrderStatusRepository orderStatusRepository; - - public OrderStatusServiceImpl(OrderStatusRepository orderStatusRepository) { - this.orderStatusRepository = orderStatusRepository; - } private List buildDto(List orderStatuses) { Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,6 +1,8 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.OrdersDto; import mk.ukim.finki.db.distributorapp.model.entities.Customer; +import mk.ukim.finki.db.distributorapp.model.entities.Manager; import mk.ukim.finki.db.distributorapp.model.entities.Orders; import mk.ukim.finki.db.distributorapp.repository.OrdersRepository; @@ -12,10 +14,8 @@ @Service +@RequiredArgsConstructor public class OrdersServiceImpl implements OrdersService { private final OrdersRepository ordersRepository; - public OrdersServiceImpl(OrdersRepository ordersRepository) { - this.ordersRepository = ordersRepository; - } private List buildDto(List orders) { @@ -117,3 +117,15 @@ this.ordersRepository.deleteById(id); } + + @Override + public List findCurrentOrdersByCustomer(Customer customer) { + List orders = this.ordersRepository.getCurrentOrdersByCustomer(customer.getUserId()); + return buildDto(orders); + } + + @Override + public List getNewOrdersByManager(Manager manager) { + List orders = this.ordersRepository.getNewOrdersByManager(manager.getUserId()); + return buildDto(orders); + } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/PriceServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/PriceServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/PriceServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.PriceDto; import mk.ukim.finki.db.distributorapp.model.entities.Article; @@ -12,10 +13,8 @@ @Service +@RequiredArgsConstructor public class PriceServiceImpl implements PriceService { private final PriceRepository priceRepository; - public PriceServiceImpl(PriceRepository priceRepository) { - this.priceRepository = priceRepository; - } private List buildDto(List prices) { Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.ProFormaDto; import mk.ukim.finki.db.distributorapp.model.entities.ProForma; @@ -11,10 +12,8 @@ @Service +@RequiredArgsConstructor public class ProFormaServiceImpl implements ProFormaService { private final ProFormaRepository proFormaRepository; - public ProFormaServiceImpl(ProFormaRepository proFormaRepository) { - this.proFormaRepository = proFormaRepository; - } private List buildDto(List proFormas) { Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaStatusServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaStatusServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaStatusServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.ProFormaStatusDto; import mk.ukim.finki.db.distributorapp.model.entities.ProFormaStatus; @@ -11,10 +12,8 @@ @Service +@RequiredArgsConstructor public class ProFormaStatusServiceImpl implements ProFormaStatusService { private final ProFormaStatusRepository proFormaStatusRepository; - public ProFormaStatusServiceImpl(ProFormaStatusRepository proFormaStatusRepository) { - this.proFormaStatusRepository = proFormaStatusRepository; - } private List buildDto(List proFormaStatuses) { Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/RegionServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/RegionServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/RegionServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.RegionDto; import mk.ukim.finki.db.distributorapp.model.entities.Region; @@ -11,11 +12,7 @@ @Service +@RequiredArgsConstructor public class RegionServiceImpl implements RegionService { - private final RegionRepository regionRepository; - - public RegionServiceImpl(RegionRepository regionRepository) { - this.regionRepository = regionRepository; - } private List buildDto(List regions) { @@ -68,4 +65,9 @@ @Override + public RegionDto getRegionByCityId(Integer cityId) { + return this.regionRepository.getRegionByCityId(cityId); + } + + @Override public void deleteById(Integer id) { this.regionRepository.deleteById(id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/UsersServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/UsersServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/UsersServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,6 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.dto.UserDto; import mk.ukim.finki.db.distributorapp.model.entities.Users; import mk.ukim.finki.db.distributorapp.repository.UsersRepository; @@ -9,10 +11,24 @@ @Service +@RequiredArgsConstructor public class UsersServiceImpl implements UsersService { private final UsersRepository usersRepository; - public UsersServiceImpl(UsersRepository usersRepository) { - this.usersRepository = usersRepository; + public UserDto buildDto(Users user){ + return new UserDto( + user.getUserId(), + user.getUsername(), + user.getUserSurname(), + user.getUserEmail(), + user.getUserMobile(), + user.getUserImage(), + user.getCity().getCityId(), + user.getCity().getCityName(), + user.getCity().getRegion().getRegionName(), + user.getUserRole(), + user.getUserResetToken(), + user.getUserResetTokenExpiry(), + user.getClazz_()); } @@ -21,3 +37,44 @@ return this.usersRepository.listAll(); } + + @Override + public Users findUserById(Long id) { + return this.usersRepository.findById(id).get(); + } + + @Override + public Users findUserByEmail(String email) { + return this.usersRepository.findUserByUserEmailIgnoreCase(email).get(); + } + + @Override + public Integer edit(UserDto userDto) { + Users user = this.usersRepository.findUserByUserEmailIgnoreCase(userDto.getEmail()).get(); + return this.usersRepository.edit( + userDto.getId(), + userDto.getFirstName(), + userDto.getLastName(), + user.getUserPassword(), + userDto.getEmail(), + userDto.getPhone(), + user.getUserSalt(), + user.getUserActive(), + userDto.getImage(), + userDto.getCityId(), + userDto.getRole().name(), + userDto.getRtoken(), + userDto.getRtoken_exp(), + userDto.getClazz_() + ); + } + + @Override + public Users findUserByResetToken(String token) { + return this.usersRepository.findUserByResetToken("'"+token+"'").get(); + } + + @Override + public Integer deleteUserById(Long id) { + return 0; + } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,7 +1,9 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.dto.VehicleBasicDto; import mk.ukim.finki.db.distributorapp.model.dto.VehicleDto; +import mk.ukim.finki.db.distributorapp.model.entities.Manager; import mk.ukim.finki.db.distributorapp.model.entities.Vehicle; -import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import mk.ukim.finki.db.distributorapp.repository.VehicleRepository; import mk.ukim.finki.db.distributorapp.service.VehicleService; @@ -12,10 +14,8 @@ @Service +@RequiredArgsConstructor public class VehicleServiceImpl implements VehicleService { + private final VehicleRepository vehicleRepository; - - public VehicleServiceImpl(VehicleRepository vehicleRepository) { - this.vehicleRepository = vehicleRepository; - } private VehicleDto buildDto(Vehicle veh) { @@ -57,7 +57,6 @@ @Override - public List getVehiclesByWarehouse(Warehouse warehouse) { - List vehicles = this.vehicleRepository.findAllByWarehouse(warehouse.getWarehouseId()); - return buildDtoList(vehicles); + public List getVehiclesByWarehouse(Integer warehouseId) { + return this.vehicleRepository.findAllByWarehouseDto(warehouseId); } @@ -97,3 +96,10 @@ this.vehicleRepository.delete(id); } + //------------------------------------------------------------------------------------------------------------------ + + @Override + public List getVehiclesByManager(Manager manager) { + List vehicles = this.vehicleRepository.getVehiclesByManager(manager.getUserId()); + return buildDtoList(vehicles); + } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,6 +1,8 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.WarehouseDto; import mk.ukim.finki.db.distributorapp.model.entities.City; +import mk.ukim.finki.db.distributorapp.model.entities.Manager; import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import mk.ukim.finki.db.distributorapp.repository.WarehouseRepository; @@ -12,10 +14,7 @@ @Service +@RequiredArgsConstructor public class WarehouseServiceImpl implements WarehouseService { private final WarehouseRepository warehouseRepository; - - public WarehouseServiceImpl(WarehouseRepository warehouseRepository) { - this.warehouseRepository = warehouseRepository; - } private List buildDtoList(List warehouses) { @@ -61,4 +60,9 @@ @Override + public WarehouseDto findByCityId(Integer id) { + return this.warehouseRepository.findWarehouseDtoByCityId(id); + } + + @Override public Integer create(WarehouseDto warehouseDto) { return this.warehouseRepository.create( @@ -81,3 +85,8 @@ this.warehouseRepository.findById(id); } + + @Override + public List getInventoryByManager(Manager manager) { + return List.of(); + } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WeekdayServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WeekdayServiceImpl.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WeekdayServiceImpl.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; +import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.WeekdayDto; import mk.ukim.finki.db.distributorapp.model.entities.Weekday; @@ -11,10 +12,7 @@ @Service +@RequiredArgsConstructor public class WeekdayServiceImpl implements WeekdayService { private final WeekdayRepository weekdayRepository; - - public WeekdayServiceImpl(WeekdayRepository weekdayRepository) { - this.weekdayRepository = weekdayRepository; - } private List buildDto(List weekdays) { Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/AdminController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/AdminController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/AdminController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,115 @@ +package mk.ukim.finki.db.distributorapp.web; + +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.dto.*; +import mk.ukim.finki.db.distributorapp.security.auth.AuthService; +import mk.ukim.finki.db.distributorapp.service.*; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Controller +@RequiredArgsConstructor +@RequestMapping("/admin") +public class AdminController { + + private final AuthService authService; + private final CityService cityService; + private final WarehouseService warehouseService; + private final DriverService driverService; + private final VehicleService vehicleService; + + @GetMapping({"/dashboard","/"}) + public String getDashboard(Model model) + { + return "home/admin"; + } + + // MANAGER CONTROLS: + + @GetMapping("/create-manager") + public String createManager(Model model) { + List cities = this.cityService.findAllCityDtos(); + model.addAttribute("cities", cities); + model.addAttribute("manager", new CreateManagerDto()); + return "create-manager"; + } + + @PostMapping("/create-manager") + public String createManager(@ModelAttribute("manager") CreateManagerDto createManagerDto) throws Exception { + WarehouseDto wh = this.warehouseService.findByCityId(createManagerDto.getCity()); + createManagerDto.setWarehouseId(wh.getId()); + this.authService.createManager(createManagerDto); + return "redirect:/manager/all"; + } + + @GetMapping("/edit-manager") + public String editManager() { + return "edit-manager"; + } + + @GetMapping("/warehouse-by-city") + @ResponseBody + public WarehouseDto getWarehouseByCity(@RequestParam("cityId") Integer cityId) { + return this.warehouseService.findByCityId(cityId); + } + + // DRIVER CONTROLS: + @GetMapping("/create-driver") + public String createDriver(Model model) { + List cities = this.cityService.findAllCityDtos(); + model.addAttribute("cities", cities); + model.addAttribute("driver", new CreateDriverDto()); + return "create-driver"; + } + + @GetMapping("/vehicle-by-city") + @ResponseBody + public List getVehicleByCity(@RequestParam("cityId") Integer cityId) { + WarehouseDto wh = this.warehouseService.findByCityId(cityId); + return this.vehicleService.getVehiclesByWarehouse(wh.getId()); + } + + @PostMapping("/create-driver") + public String createDriver(@ModelAttribute("driver") CreateDriverDto createDriverDto, @ModelAttribute("vehicle") VehicleDto vehicleDto) throws Exception { + this.authService.createDriver(createDriverDto); + return "all-drivers"; + } + + @GetMapping("/edit-driver/{id}") + public String editDriver(@PathVariable("id") Long id, Model model) { + DriverDto driver = this.driverService.findById(id); + model.addAttribute("driver", driver); + return "edit-driver"; + } + + @PostMapping("/edit-driver/{id}") + public String editDriver(@PathVariable("id") Long id, @ModelAttribute("driver") DriverDto driverDto, Model model) { + Integer res = this.driverService.edit(driverDto); + if (res == 1) { + model.addAttribute("edit-success", true); + } else { + model.addAttribute("edit-success", false); + } + return "all-drivers"; + } + + + // WAREHOUSE CONTROLS: + + @GetMapping("/create-warehouse") + public String createWarehouse(Model model) { + List cities = this.cityService.findAllCityDtos(); + model.addAttribute("warehouse", new WarehouseDto()); + model.addAttribute("cities", cities); + return "create-warehouse"; + } + + @PostMapping("/create-warehouse") + public String createWarehouse(@ModelAttribute("warehouse") WarehouseDto warehouseDto, Model model) { + this.warehouseService.create(warehouseDto); + return "redirect:/warehouse"; + } +} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,43 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.ArticleDto; -import mk.ukim.finki.db.distributorapp.service.ArticleService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/article") -public class ArticleController { - private final ArticleService articleService; - - public ArticleController(ArticleService articleService) { - this.articleService = articleService; - } - - @GetMapping("/all") - ResponseEntity> getAllArticlesDto() { - List articles = articleService.getAllArticles(); - return ResponseEntity.ok(articles); - } - - @PutMapping("/add") - ResponseEntity addArticle(@RequestBody ArticleDto articleDto) { - Integer res = this.articleService.create(articleDto); - - return ResponseEntity.ok(res); - } - - @PutMapping("/edit") - ResponseEntity editArticle(@RequestBody ArticleDto articleDto) { - Integer res = this.articleService.editById(articleDto); - return ResponseEntity.ok(res); } - - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteArticle(@PathVariable Long id) { - this.articleService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleUnitController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleUnitController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.ArticleUnitDto; -import mk.ukim.finki.db.distributorapp.service.ArticleUnitService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/articleUnit") -public class ArticleUnitController { - private final ArticleUnitService articleUnitService; - - public ArticleUnitController(ArticleUnitService articleUnitService) { - this.articleUnitService = articleUnitService; - } - - @GetMapping("/all") - public ResponseEntity> getAllUnits() { - List units = this.articleUnitService.getAllArticleUnits(); - return ResponseEntity.ok(units); - } - - @PutMapping("/add") - public ResponseEntity addUnit(@RequestBody ArticleUnitDto articleUnitDto) { - Integer result = this.articleUnitService.create(articleUnitDto); - return ResponseEntity.ok(result); - } - - @PutMapping("edit") - public ResponseEntity editUnit(@RequestBody ArticleUnitDto articleUnitDto) { - Integer result = this.articleUnitService.edit(articleUnitDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteUnit(@PathVariable Long id) { - this.articleUnitService.delete(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/CategoryController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CategoryController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.CategoryDto; -import mk.ukim.finki.db.distributorapp.service.CategoryService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/category") -public class CategoryController { - private final CategoryService categoryService; - - public CategoryController(CategoryService categoryService) { - this.categoryService = categoryService; - } - - @GetMapping("/all") - public ResponseEntity> getAllCategoriesDto() { - List categoryDtos = this.categoryService.listCategories(); - return ResponseEntity.ok(categoryDtos); - } - - @PutMapping("/add") - public ResponseEntity addCategory(@RequestBody CategoryDto categoryDto) { - Integer result = this.categoryService.create(categoryDto); - return ResponseEntity.ok(result); - } - - @PutMapping("edit") - public ResponseEntity editCategory(@RequestBody CategoryDto categoryDto) { - Integer result = this.categoryService.edit(categoryDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteCategory(@PathVariable Long id) { - this.categoryService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/CityController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CityController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,43 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.CityDto; -import mk.ukim.finki.db.distributorapp.service.CityService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/city") -public class CityController { - private final CityService cityService; - - public CityController(CityService cityService) { - this.cityService = cityService; - } - - @GetMapping("/all") - public ResponseEntity> getAllCities() { - List cities = this.cityService.listCities(); - return ResponseEntity.ok(cities); - } - - @PutMapping("/add") - public ResponseEntity addCity(@RequestBody CityDto CityDto) { - Integer result = this.cityService.create(CityDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editCity(@RequestBody CityDto CityDto) { - Integer result = this.cityService.edit(CityDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteCity(@PathVariable Long id) { - this.cityService.deleteById(id); - return new ResponseEntity<>(HttpStatus.OK); - } -} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,43 +1,37 @@ package mk.ukim.finki.db.distributorapp.web; -import mk.ukim.finki.db.distributorapp.model.dto.CustomerDto; +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.entities.Customer; +import mk.ukim.finki.db.distributorapp.model.entities.Users; import mk.ukim.finki.db.distributorapp.service.CustomerService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import mk.ukim.finki.db.distributorapp.service.DeliveryService; +import mk.ukim.finki.db.distributorapp.service.OrdersService; +import mk.ukim.finki.db.distributorapp.service.UsersService; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; -import java.util.List; +@Controller +@RequiredArgsConstructor +@RequestMapping(value = "/customer") +public class CustomerController { + private final CustomerService customerService; + private final UsersService usersService; + private final OrdersService ordersService; + private final DeliveryService deliveryService; -@RestController -@RequestMapping("/customer") -public class CustomerController { - - private final CustomerService customerService; - - public CustomerController(CustomerService customerService) { - this.customerService = customerService; - } - - @GetMapping("/all") - public ResponseEntity> getAllCustomers() { - List result = customerService.findAllCustomers(); - return ResponseEntity.ok(result); - } - - @PutMapping("/add") - public ResponseEntity addCustomer(@RequestBody CustomerDto customerDto) { - Integer result = this.customerService.create(customerDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editCustomer(@RequestBody CustomerDto customerDto) { - Integer result = this.customerService.edit(customerDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteCustomer(@PathVariable Long id) { - this.customerService.deleteById(id); - return ResponseEntity.noContent().build(); + @GetMapping({"/dashboard","/"}) + public String dashboard(Model model) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + String userEmail = authentication.getName(); + Users user = this.usersService.findUserByEmail(userEmail); + Customer customer = this.customerService.getCustomerObjById(user.getUserId()); + model.addAttribute("customer", customer); + model.addAttribute("currentOrders", ordersService.findCurrentOrdersByCustomer(customer)); + model.addAttribute("currentDeliveries", deliveryService.getCurrentDeliveriesByCustomer(customer)); + return "home/customer"; } } Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerWeekdayController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerWeekdayController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,28 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.CustomerWeekdayDto; -import mk.ukim.finki.db.distributorapp.service.CustomerWeekdayService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping("/customerWeekday") -public class CustomerWeekdayController { - private final CustomerWeekdayService customerWeekdayService; - - public CustomerWeekdayController(CustomerWeekdayService customerWeekdayService) { - this.customerWeekdayService = customerWeekdayService; - } - - @GetMapping("/all") - public ResponseEntity> getAllWeekdays(){ - List weekdays = customerWeekdayService.getAllWeekdays(); - return ResponseEntity.ok(weekdays); - } - - -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/DeliveryController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DeliveryController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; -import mk.ukim.finki.db.distributorapp.service.DeliveryService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/delivery") -public class DeliveryController { - private final DeliveryService deliveryService; - - public DeliveryController(DeliveryService deliveryService) { - this.deliveryService = deliveryService; - } - - @GetMapping("/all") - public ResponseEntity> getAllDeliveries() { - List deliveries = deliveryService.getAllDeliveries(); - return ResponseEntity.ok(deliveries); - } - - @PutMapping("/add") - public ResponseEntity addDelivery(@RequestBody DeliveryDto DeliveryDto) { - Integer result = this.deliveryService.create(DeliveryDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editDelivery(@RequestBody DeliveryDto DeliveryDto) { - Integer result = this.deliveryService.edit(DeliveryDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteDelivery(@PathVariable Long id) { - this.deliveryService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/DeliveryStatusController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DeliveryStatusController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.DeliveryStatusDto; -import mk.ukim.finki.db.distributorapp.service.DeliveryStatusService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/dStatus") -public class DeliveryStatusController { - private final DeliveryStatusService deliveryStatusService; - - public DeliveryStatusController(DeliveryStatusService deliveryStatusService) { - this.deliveryStatusService = deliveryStatusService; - } - - @GetMapping("/all") - public ResponseEntity> getAllDeliveryStatus() { - List statuses = this.deliveryStatusService.getAllDeliveryStatus(); - return ResponseEntity.ok(statuses); - } - - @PutMapping("/add") - public ResponseEntity addDeliveryStatus(@RequestBody DeliveryStatusDto DeliveryStatusDto) { - Integer result = this.deliveryStatusService.create(DeliveryStatusDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editDeliveryStatus(@RequestBody DeliveryStatusDto DeliveryStatusDto) { - Integer result = this.deliveryStatusService.edit(DeliveryStatusDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteDeliveryStatus(@PathVariable Short id) { - this.deliveryStatusService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,42 +1,43 @@ package mk.ukim.finki.db.distributorapp.web; -import mk.ukim.finki.db.distributorapp.model.dto.DriverDto; +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.entities.Driver; +import mk.ukim.finki.db.distributorapp.model.entities.Users; +import mk.ukim.finki.db.distributorapp.security.auth.AuthService; +import mk.ukim.finki.db.distributorapp.service.CityService; +import mk.ukim.finki.db.distributorapp.service.DeliveryService; import mk.ukim.finki.db.distributorapp.service.DriverService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import mk.ukim.finki.db.distributorapp.service.UsersService; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; -import java.util.List; - -@RestController -@RequestMapping("/driver") +@Controller +@RequiredArgsConstructor +@RequestMapping(value = "/driver") public class DriverController { private final DriverService driverService; + private final AuthService authService; + private final UsersService usersService; + private final DeliveryService deliveryService; + private final CityService cityService; - public DriverController(DriverService driverService) { - this.driverService = driverService; + @GetMapping("/all") + public String allDrivers(Model model) { +// List drivers = driverService.getAllDrivers(); +// model.addAttribute("drivers", drivers); + return "all-drivers"; } - @GetMapping("/all") - public ResponseEntity> getAllDrivers() { - List drivers = driverService.getAllDrivers(); - return ResponseEntity.ok(drivers); + @GetMapping({"/dashboard","/"}) + public String dashboard(Model model) { + Users user = this.usersService.findUserByEmail(model.getAttribute("email").toString()); + Driver driver = this.driverService.getDriverObjById(user.getUserId()); + model.addAttribute("newDeliveries", deliveryService.getAllNewDeliveriesByDriver(driver)); + model.addAttribute("doneDeliveries", deliveryService.getAllDeliveriesByDriver(driver)); + return "home/driver"; } - @PutMapping("/add") - public ResponseEntity addDriver(@RequestBody DriverDto driverDto) { - Integer result = this.driverService.create(driverDto); - return ResponseEntity.ok(result); - } - @PutMapping("/edit") - public ResponseEntity editDriver(@RequestBody DriverDto driverDto) { - Integer result = this.driverService.edit(driverDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteDriver(@PathVariable Long id) { - this.driverService.deleteById(id); - return ResponseEntity.noContent().build(); - } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/HomeController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/HomeController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/HomeController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,18 +1,30 @@ package mk.ukim.finki.db.distributorapp.web; -import mk.ukim.finki.db.distributorapp.model.entities.Customer; -import mk.ukim.finki.db.distributorapp.model.entities.Driver; -import mk.ukim.finki.db.distributorapp.model.entities.Manager; import mk.ukim.finki.db.distributorapp.model.entities.Users; +import mk.ukim.finki.db.distributorapp.service.*; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -@RestController -@RequestMapping("/api/home") +@Controller +@RequestMapping({"/","/home"}) public class HomeController { + + private final DeliveryService deliveryService; + private final OrdersService ordersService; + private final VehicleService vehicleService; + private final WarehouseService warehouseService; + private final UsersService usersService; + + public HomeController(DeliveryService deliveryService, OrdersService ordersService, VehicleService vehicleService, WarehouseService warehouseService, UsersService usersService) { + this.deliveryService = deliveryService; + this.ordersService = ordersService; + this.vehicleService = vehicleService; + this.warehouseService = warehouseService; + this.usersService = usersService; + } @GetMapping @@ -22,21 +34,34 @@ if (authentication == null || !authentication.isAuthenticated() || authentication.getPrincipal().equals("anonymousUser")) { model.addAttribute("userType", "Guest"); - return "home"; + return "authentication/login"; } - Users user = (Users) authentication.getPrincipal(); + String userEmail = authentication.getName(); + if(userEmail.equals("superuser@admin.com")) { + return "redirect:/admin/dashboard"; + } + Users user = this.usersService.findUserByEmail(userEmail); + System.out.println("Authentication principal: " + authentication.getPrincipal().getClass().getName()); + System.out.println("Authorities: " + authentication.getAuthorities()); - if (user instanceof Customer) { - model.addAttribute("userType", "Customer"); - return "redirect:customer/home"; - } else if (user instanceof Driver) { - model.addAttribute("userType", "Driver"); - return "redirect:driver/home"; - } else if (user instanceof Manager) { - model.addAttribute("userType", "Manager"); - return "redirect:manager/home"; + switch (user.getUserRole()) { + case ROLE_CUSTOMER -> { + return "redirect:/customer/dashboard"; + } + case ROLE_DRIVER -> { + return "redirect:/driver/dashboard"; + } + case ROLE_MANAGER -> { + return "redirect:/manager/dashboard"; + } } model.addAttribute("userType", "Guest"); - return "home"; + return "authentication/login"; + } + + @GetMapping("/access_denied") + public String getAccessDeniedPage(Model model) { + model.addAttribute("error", "access_denied"); + return "authentication/access_denied"; } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,43 +1,41 @@ package mk.ukim.finki.db.distributorapp.web; -import mk.ukim.finki.db.distributorapp.model.dto.ManagerDto; -import mk.ukim.finki.db.distributorapp.service.ManagerService; -import org.springframework.http.ResponseEntity; +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.entities.Manager; +import mk.ukim.finki.db.distributorapp.model.entities.Users; +import mk.ukim.finki.db.distributorapp.service.*; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import java.util.List; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; @Controller -@RequestMapping("/manager") +@RequestMapping(value = "/manager") +@RequiredArgsConstructor public class ManagerController { private final ManagerService managerService; - public ManagerController(ManagerService managerService) { - this.managerService = managerService; + private final UsersService usersService; + private final VehicleService vehicleService; + private final OrdersService ordersService; + private final WarehouseService warehouseService; + private final DeliveryService deliveryService; + + + @GetMapping({"/dashboard","/"}) + public String dashboard(Model model) { + Users user = this.usersService.findUserByEmail(model.getAttribute("email").toString()); + Manager manager = this.managerService.getManagerByIdObj(user.getUserId()); + + model.addAttribute("currentInventory", warehouseService.getInventoryByManager(manager)); + model.addAttribute("vehicleStatus", vehicleService.getVehiclesByManager(manager)); + model.addAttribute("newOrders", ordersService.getNewOrdersByManager(manager)); + model.addAttribute("currentDeliveries", deliveryService.getCurrentDeliveriesByManager(manager)); + return "home/manager"; } @GetMapping("/all") - public ResponseEntity> getAllManagers() { - List managers = managerService.getAllManagers(); - return ResponseEntity.ok(managers); - } - - @PutMapping("/add") - public ResponseEntity addManager(@RequestBody ManagerDto ManagerDto) { - Integer result = this.managerService.create(ManagerDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editManager(@RequestBody ManagerDto ManagerDto) { - Integer result = this.managerService.edit(ManagerDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteManager(@PathVariable Long id) { - this.managerService.deleteById(id); - return ResponseEntity.noContent().build(); + public String allManagers(Model model) { + return "all-managers"; } } Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManufacturerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManufacturerController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.ManufacturerDto; -import mk.ukim.finki.db.distributorapp.service.ManufacturerService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/manufacturer") -public class ManufacturerController { - private final ManufacturerService manufacturerService; - - public ManufacturerController(ManufacturerService manufacturerService) { - this.manufacturerService = manufacturerService; - } - - @GetMapping("/all") - public ResponseEntity> getAllManufacturers() { - List manufacturers = manufacturerService.getAllManufacturers(); - return ResponseEntity.ok(manufacturers); - } - - @PutMapping("/add") - public ResponseEntity addManufacturer(@RequestBody ManufacturerDto ManufacturerDto) { - Integer result = this.manufacturerService.create(ManufacturerDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editManufacturer(@RequestBody ManufacturerDto ManufacturerDto) { - Integer result = this.manufacturerService.edit(ManufacturerDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteManufacturer(@PathVariable Long id) { - this.manufacturerService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/OrderStatusController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/OrderStatusController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.OrderStatusDto; -import mk.ukim.finki.db.distributorapp.service.OrderStatusService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/oStatus") -public class OrderStatusController { - private final OrderStatusService orderStatusService; - - public OrderStatusController(OrderStatusService orderStatusService) { - this.orderStatusService = orderStatusService; - } - - @GetMapping("/all") - public ResponseEntity> getAllOrderStatus() { - List statuses = this.orderStatusService.getAllOrderStatus(); - return ResponseEntity.ok(statuses); - } - - @PutMapping("/add") - public ResponseEntity addOrderStatus(@RequestBody OrderStatusDto OrderStatusDto) { - Integer result = this.orderStatusService.create(OrderStatusDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editOrderStatus(@RequestBody OrderStatusDto OrderStatusDto) { - Integer result = this.orderStatusService.edit(OrderStatusDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteOrderStatus(@PathVariable Short id) { - this.orderStatusService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/OrdersController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/OrdersController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,43 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.OrdersDto; -import mk.ukim.finki.db.distributorapp.service.OrdersService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/order") -public class OrdersController { - private final OrdersService OrderService; - - public OrdersController(OrdersService orderService) { - OrderService = orderService; - } - - - @GetMapping("/all") - public ResponseEntity> getAllOrders() { - List orders = OrderService.getAllOrders(); - return ResponseEntity.ok(orders); - } - - @PutMapping("/add") - public ResponseEntity addOrders(@RequestBody OrdersDto OrdersDto) { - Integer result = this.OrderService.create(OrdersDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editOrders(@RequestBody OrdersDto OrdersDto) { - Integer result =this.OrderService.edit(OrdersDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteOrders(@PathVariable Long id) { - this.OrderService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/PriceController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/PriceController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.PriceDto; -import mk.ukim.finki.db.distributorapp.service.PriceService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/price") -public class PriceController { - private final PriceService priceService; - - public PriceController(PriceService priceService) { - this.priceService = priceService; - } - - @GetMapping("/all") - public ResponseEntity> getAllPrices() { - List prices = this.priceService.getAllPrices(); - return ResponseEntity.ok(prices); - } - - @PutMapping("/add") - public ResponseEntity addPrice(@RequestBody PriceDto PriceDto) { - Integer result = this.priceService.create(PriceDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editPrice(@RequestBody PriceDto PriceDto) { - Integer result = this.priceService.edit(PriceDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deletePrice(@PathVariable Integer id) { - this.priceService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/ProFormaController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ProFormaController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.ProFormaDto; -import mk.ukim.finki.db.distributorapp.service.ProFormaService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/pForma") -public class ProFormaController { - private final ProFormaService proFormaService; - - public ProFormaController(ProFormaService proFormaService) { - this.proFormaService = proFormaService; - } - - @GetMapping("/all") - public ResponseEntity> getAllProFormas() { - List proFormas = this.proFormaService.getAllProForma(); - return ResponseEntity.ok(proFormas); - } - - @PutMapping("/add") - public ResponseEntity addProForma(@RequestBody ProFormaDto ProFormaDto) { - Integer result = this.proFormaService.create(ProFormaDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editProForma(@RequestBody ProFormaDto ProFormaDto) { - Integer result = this.proFormaService.edit(ProFormaDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteProForma(@PathVariable Long id) { - this.proFormaService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/ProFormaStatusController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ProFormaStatusController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.ProFormaStatusDto; -import mk.ukim.finki.db.distributorapp.service.ProFormaStatusService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/pfStatus") -public class ProFormaStatusController { - private final ProFormaStatusService proFormaStatusService; - - public ProFormaStatusController(ProFormaStatusService proFormaStatusService) { - this.proFormaStatusService = proFormaStatusService; - } - - @GetMapping("/all") - public ResponseEntity> getAllProFormaStatuss() { - List statuses = proFormaStatusService.getAllProFormaStatus(); - return ResponseEntity.ok(statuses); - } - - @PutMapping("/add") - public ResponseEntity addProFormaStatus(@RequestBody ProFormaStatusDto ProFormaStatusDto) { - Integer result = this.proFormaStatusService.create(ProFormaStatusDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editProFormaStatus(@RequestBody ProFormaStatusDto ProFormaStatusDto) { - Integer result = this.proFormaStatusService.edit(ProFormaStatusDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteProFormaStatus(@PathVariable Short id) { - this.proFormaStatusService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/RegionController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/RegionController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.RegionDto; -import mk.ukim.finki.db.distributorapp.service.RegionService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/region") -public class RegionController { - private final RegionService regionService; - - public RegionController(RegionService regionService) { - this.regionService = regionService; - } - - @GetMapping("/all") - public ResponseEntity> getAllRegions() { - List regions = this.regionService.getAllRegions(); - return ResponseEntity.ok(regions); - } - - @PutMapping("/add") - public ResponseEntity addRegion(@RequestBody RegionDto RegionDto) { - Integer result = this.regionService.create(RegionDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editRegion(@RequestBody RegionDto RegionDto) { - Integer result = this.regionService.edit(RegionDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteRegion(@PathVariable Integer id) { - this.regionService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/UsersController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/UsersController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,49 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.UserDto; -import mk.ukim.finki.db.distributorapp.model.entities.Users; -import mk.ukim.finki.db.distributorapp.service.UsersService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - -@RestController() -@RequestMapping("/users") -public class UsersController { - - private final UsersService usersService; - - public UsersController(UsersService usersService) { - this.usersService = usersService; - } - - private List buildDto(List users) { - List dtos = new ArrayList<>(); - for (mk.ukim.finki.db.distributorapp.model.entities.Users user : users) { - UserDto dto = new UserDto( - user.getUserId(), - user.getUsername(), - user.getUserSurname(), - user.getUserEmail(), - user.getUserMobile(), - user.getUserImage(), - user.getCity().getCityId(), - user.getCity().getCityName(), - user.getCity().getRegion().getRegionName() - ); - dtos.add(dto); - } - return dtos; - } - - @GetMapping("/all") - public ResponseEntity> getAllUsers(){ - List users = this.usersService.findAllUsers(); - return ResponseEntity.ok(buildDto(users)); - } - -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/VehicleController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/VehicleController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.VehicleDto; -import mk.ukim.finki.db.distributorapp.service.VehicleService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/vehicle") -public class VehicleController { - private final VehicleService vehicleService; - - public VehicleController(VehicleService vehicleService) { - this.vehicleService = vehicleService; - } - - @GetMapping("/all") - public ResponseEntity> getAllVehicles() { - List vehicles = vehicleService.getAllVehicles(); - return ResponseEntity.ok(vehicles); - } - - @PutMapping("/add") - public ResponseEntity addVehicle(@RequestBody VehicleDto VehicleDto) { - Integer result = this.vehicleService.create(VehicleDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editVehicle(@RequestBody VehicleDto VehicleDto) { - Integer result = this.vehicleService.edit(VehicleDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteVehicle(@PathVariable Integer id) { - this.vehicleService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/WarehouseController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/WarehouseController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/WarehouseController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,42 +1,14 @@ package mk.ukim.finki.db.distributorapp.web; -import mk.ukim.finki.db.distributorapp.model.dto.WarehouseDto; -import mk.ukim.finki.db.distributorapp.service.WarehouseService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; -import java.util.List; - -@RestController -@RequestMapping("/warehouse") +@Controller +@RequestMapping(value = "/warehouse") public class WarehouseController { - private final WarehouseService warehouseService; - - public WarehouseController(WarehouseService warehouseService) { - this.warehouseService = warehouseService; - } - - @GetMapping("/all") - public ResponseEntity> getAllWarehouses() { - List warehouses = this.warehouseService.getAllWarehouses(); - return ResponseEntity.ok(warehouses); - } - - @PutMapping("/add") - public ResponseEntity addWarehouse(@RequestBody WarehouseDto WarehouseDto) { - Integer result = this.warehouseService.create(WarehouseDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editWarehouse(@RequestBody WarehouseDto WarehouseDto) { - Integer result = this.warehouseService.edit(WarehouseDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteWarehouse(@PathVariable Integer id) { - this.warehouseService.deleteById(id); - return ResponseEntity.noContent().build(); + @GetMapping("/create") + public String createWarehouse(){ + return "create-warehouse"; } } Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/WeekdayController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/WeekdayController.java (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web; - -import mk.ukim.finki.db.distributorapp.model.dto.WeekdayDto; -import mk.ukim.finki.db.distributorapp.service.WeekdayService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/weekday") -public class WeekdayController { - private final WeekdayService weekdayService; - - public WeekdayController(WeekdayService weekdayService) { - this.weekdayService = weekdayService; - } - - @GetMapping("/all") - public ResponseEntity> getAllWeekdays(){ - List weekdays = weekdayService.getAllWeekdays(); - return ResponseEntity.ok(weekdays); - } - - @PutMapping("/add") - public ResponseEntity addWeekday(@RequestBody WeekdayDto weekdayDto){ - Integer result = this.weekdayService.create(weekdayDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editWeekday(@RequestBody WeekdayDto weekdayDto){ - Integer result = this.weekdayService.edit(weekdayDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteWeekday(@PathVariable Short id){ - this.weekdayService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestArticleController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestArticleController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestArticleController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,44 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.ArticleDto; +import mk.ukim.finki.db.distributorapp.service.ArticleService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@CrossOrigin(origins = "http://localhost:4200") +@RequestMapping("/rest/article") +public class RestArticleController { + private final ArticleService articleService; + + public RestArticleController(ArticleService articleService) { + this.articleService = articleService; + } + + @GetMapping("/all") + ResponseEntity> getAllArticlesDto() { + List articles = articleService.getAllArticles(); + return ResponseEntity.ok(articles); + } + + @PutMapping("/add") + ResponseEntity addArticle(@RequestBody ArticleDto articleDto) { + Integer res = this.articleService.create(articleDto); + + return ResponseEntity.ok(res); + } + + @PutMapping("/edit") + ResponseEntity editArticle(@RequestBody ArticleDto articleDto) { + Integer res = this.articleService.editById(articleDto); + return ResponseEntity.ok(res); } + + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteArticle(@PathVariable Long id) { + this.articleService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestArticleUnitController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestArticleUnitController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestArticleUnitController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.ArticleUnitDto; +import mk.ukim.finki.db.distributorapp.service.ArticleUnitService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/restarticleUnit") +public class RestArticleUnitController { + private final ArticleUnitService articleUnitService; + + public RestArticleUnitController(ArticleUnitService articleUnitService) { + this.articleUnitService = articleUnitService; + } + + @GetMapping("/all") + public ResponseEntity> getAllUnits() { + List units = this.articleUnitService.getAllArticleUnits(); + return ResponseEntity.ok(units); + } + + @PutMapping("/add") + public ResponseEntity addUnit(@RequestBody ArticleUnitDto articleUnitDto) { + Integer result = this.articleUnitService.create(articleUnitDto); + return ResponseEntity.ok(result); + } + + @PutMapping("edit") + public ResponseEntity editUnit(@RequestBody ArticleUnitDto articleUnitDto) { + Integer result = this.articleUnitService.edit(articleUnitDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteUnit(@PathVariable Long id) { + this.articleUnitService.delete(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCategoryController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCategoryController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCategoryController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.CategoryDto; +import mk.ukim.finki.db.distributorapp.service.CategoryService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/category") +public class RestCategoryController { + private final CategoryService categoryService; + + public RestCategoryController(CategoryService categoryService) { + this.categoryService = categoryService; + } + + @GetMapping("/all") + public ResponseEntity> getAllCategoriesDto() { + List categoryDtos = this.categoryService.listCategories(); + return ResponseEntity.ok(categoryDtos); + } + + @PutMapping("/add") + public ResponseEntity addCategory(@RequestBody CategoryDto categoryDto) { + Integer result = this.categoryService.create(categoryDto); + return ResponseEntity.ok(result); + } + + @PutMapping("edit") + public ResponseEntity editCategory(@RequestBody CategoryDto categoryDto) { + Integer result = this.categoryService.edit(categoryDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteCategory(@PathVariable Long id) { + this.categoryService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCityController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCityController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCityController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,43 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.CityDto; +import mk.ukim.finki.db.distributorapp.service.CityService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/city") +public class RestCityController { + private final CityService cityService; + + public RestCityController(CityService cityService) { + this.cityService = cityService; + } + + @GetMapping("/all") + public ResponseEntity> getAllCities() { + List cities = this.cityService.listCities(); + return ResponseEntity.ok(cities); + } + + @PutMapping("/add") + public ResponseEntity addCity(@RequestBody CityDto CityDto) { + Integer result = this.cityService.create(CityDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editCity(@RequestBody CityDto CityDto) { + Integer result = this.cityService.edit(CityDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteCity(@PathVariable Integer id) { + this.cityService.deleteById(id); + return new ResponseEntity<>(HttpStatus.OK); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCustomerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCustomerController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCustomerController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,43 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.CustomerDto; +import mk.ukim.finki.db.distributorapp.service.CustomerService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/customer") +public class RestCustomerController { + + private final CustomerService customerService; + + public RestCustomerController(CustomerService customerService) { + this.customerService = customerService; + } + + @GetMapping("/all") + public ResponseEntity> getAllCustomers() { + List result = customerService.findAllCustomers(); + return ResponseEntity.ok(result); + } + + @PutMapping("/add") + public ResponseEntity addCustomer(@RequestBody CustomerDto customerDto) { + Integer result = this.customerService.create(customerDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editCustomer(@RequestBody CustomerDto customerDto) { + Integer result = this.customerService.edit(customerDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteCustomer(@PathVariable Long id) { + this.customerService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCustomerWeekdayController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCustomerWeekdayController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCustomerWeekdayController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,28 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.CustomerWeekdayDto; +import mk.ukim.finki.db.distributorapp.service.CustomerWeekdayService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/rest/customerWeekday") +public class RestCustomerWeekdayController { + private final CustomerWeekdayService customerWeekdayService; + + public RestCustomerWeekdayController(CustomerWeekdayService customerWeekdayService) { + this.customerWeekdayService = customerWeekdayService; + } + + @GetMapping("/all") + public ResponseEntity> getAllWeekdays(){ + List weekdays = customerWeekdayService.getAllWeekdays(); + return ResponseEntity.ok(weekdays); + } + + +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; +import mk.ukim.finki.db.distributorapp.service.DeliveryService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/delivery") +public class RestDeliveryController { + private final DeliveryService deliveryService; + + public RestDeliveryController(DeliveryService deliveryService) { + this.deliveryService = deliveryService; + } + + @GetMapping("/all") + public ResponseEntity> getAllDeliveries() { + List deliveries = deliveryService.getAllDeliveries(); + return ResponseEntity.ok(deliveries); + } + + @PutMapping("/add") + public ResponseEntity addDelivery(@RequestBody DeliveryDto DeliveryDto) { + Integer result = this.deliveryService.create(DeliveryDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editDelivery(@RequestBody DeliveryDto DeliveryDto) { + Integer result = this.deliveryService.edit(DeliveryDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteDelivery(@PathVariable Long id) { + this.deliveryService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryStatusController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryStatusController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryStatusController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.DeliveryStatusDto; +import mk.ukim.finki.db.distributorapp.service.DeliveryStatusService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/dStatus") +public class RestDeliveryStatusController { + private final DeliveryStatusService deliveryStatusService; + + public RestDeliveryStatusController(DeliveryStatusService deliveryStatusService) { + this.deliveryStatusService = deliveryStatusService; + } + + @GetMapping("/all") + public ResponseEntity> getAllDeliveryStatus() { + List statuses = this.deliveryStatusService.getAllDeliveryStatus(); + return ResponseEntity.ok(statuses); + } + + @PutMapping("/add") + public ResponseEntity addDeliveryStatus(@RequestBody DeliveryStatusDto DeliveryStatusDto) { + Integer result = this.deliveryStatusService.create(DeliveryStatusDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editDeliveryStatus(@RequestBody DeliveryStatusDto DeliveryStatusDto) { + Integer result = this.deliveryStatusService.edit(DeliveryStatusDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteDeliveryStatus(@PathVariable Short id) { + this.deliveryStatusService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDriverController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDriverController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDriverController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,43 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.DriverDto; +import mk.ukim.finki.db.distributorapp.service.DriverService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/driver") +public class RestDriverController { + private final DriverService driverService; + + public RestDriverController(DriverService driverService) { + this.driverService = driverService; + } + + @GetMapping("/all") + public ResponseEntity> getAllDrivers() { + List drivers = driverService.getAllDrivers(); + return ResponseEntity.ok(drivers); + } + + + @PutMapping("/add") + public ResponseEntity addDriver(@RequestBody DriverDto driverDto) { + Integer result = this.driverService.create(driverDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editDriver(@RequestBody DriverDto driverDto) { + Integer result = this.driverService.edit(driverDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteDriver(@PathVariable Long id) { + this.driverService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestManagerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestManagerController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestManagerController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,47 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.ManagerDto; +import mk.ukim.finki.db.distributorapp.service.ManagerService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/manager") +public class RestManagerController { + private final ManagerService managerService; + + public RestManagerController(ManagerService managerService) { + this.managerService = managerService; + } + + @GetMapping("/all") + public ResponseEntity> getAllManagers() { + List managers = managerService.getAllManagers(); + return ResponseEntity.ok(managers); + } + + @GetMapping("/add") + public String addManager() { + return "create-manager"; + } + + @PutMapping("/add") + public ResponseEntity addManager(@RequestBody ManagerDto ManagerDto) { + Integer result = this.managerService.create(ManagerDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editManager(@RequestBody ManagerDto ManagerDto) { + Integer result = this.managerService.edit(ManagerDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteManager(@PathVariable Long id) { + this.managerService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestManufacturerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestManufacturerController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestManufacturerController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.ManufacturerDto; +import mk.ukim.finki.db.distributorapp.service.ManufacturerService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/manufacturer") +public class RestManufacturerController { + private final ManufacturerService manufacturerService; + + public RestManufacturerController(ManufacturerService manufacturerService) { + this.manufacturerService = manufacturerService; + } + + @GetMapping("/all") + public ResponseEntity> getAllManufacturers() { + List manufacturers = manufacturerService.getAllManufacturers(); + return ResponseEntity.ok(manufacturers); + } + + @PutMapping("/add") + public ResponseEntity addManufacturer(@RequestBody ManufacturerDto ManufacturerDto) { + Integer result = this.manufacturerService.create(ManufacturerDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editManufacturer(@RequestBody ManufacturerDto ManufacturerDto) { + Integer result = this.manufacturerService.edit(ManufacturerDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteManufacturer(@PathVariable Long id) { + this.manufacturerService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestOrderStatusController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestOrderStatusController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestOrderStatusController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.OrderStatusDto; +import mk.ukim.finki.db.distributorapp.service.OrderStatusService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/oStatus") +public class RestOrderStatusController { + private final OrderStatusService orderStatusService; + + public RestOrderStatusController(OrderStatusService orderStatusService) { + this.orderStatusService = orderStatusService; + } + + @GetMapping("/all") + public ResponseEntity> getAllOrderStatus() { + List statuses = this.orderStatusService.getAllOrderStatus(); + return ResponseEntity.ok(statuses); + } + + @PutMapping("/add") + public ResponseEntity addOrderStatus(@RequestBody OrderStatusDto OrderStatusDto) { + Integer result = this.orderStatusService.create(OrderStatusDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editOrderStatus(@RequestBody OrderStatusDto OrderStatusDto) { + Integer result = this.orderStatusService.edit(OrderStatusDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteOrderStatus(@PathVariable Short id) { + this.orderStatusService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestOrdersController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestOrdersController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestOrdersController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,43 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.OrdersDto; +import mk.ukim.finki.db.distributorapp.service.OrdersService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/order") +public class RestOrdersController { + private final OrdersService OrderService; + + public RestOrdersController(OrdersService orderService) { + OrderService = orderService; + } + + + @GetMapping("/all") + public ResponseEntity> getAllOrders() { + List orders = OrderService.getAllOrders(); + return ResponseEntity.ok(orders); + } + + @PutMapping("/add") + public ResponseEntity addOrders(@RequestBody OrdersDto OrdersDto) { + Integer result = this.OrderService.create(OrdersDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editOrders(@RequestBody OrdersDto OrdersDto) { + Integer result =this.OrderService.edit(OrdersDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteOrders(@PathVariable Long id) { + this.OrderService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestPriceController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestPriceController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestPriceController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.PriceDto; +import mk.ukim.finki.db.distributorapp.service.PriceService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/price") +public class RestPriceController { + private final PriceService priceService; + + public RestPriceController(PriceService priceService) { + this.priceService = priceService; + } + + @GetMapping("/all") + public ResponseEntity> getAllPrices() { + List prices = this.priceService.getAllPrices(); + return ResponseEntity.ok(prices); + } + + @PutMapping("/add") + public ResponseEntity addPrice(@RequestBody PriceDto PriceDto) { + Integer result = this.priceService.create(PriceDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editPrice(@RequestBody PriceDto PriceDto) { + Integer result = this.priceService.edit(PriceDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deletePrice(@PathVariable Integer id) { + this.priceService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestProFormaController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestProFormaController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestProFormaController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.ProFormaDto; +import mk.ukim.finki.db.distributorapp.service.ProFormaService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/pForma") +public class RestProFormaController { + private final ProFormaService proFormaService; + + public RestProFormaController(ProFormaService proFormaService) { + this.proFormaService = proFormaService; + } + + @GetMapping("/all") + public ResponseEntity> getAllProFormas() { + List proFormas = this.proFormaService.getAllProForma(); + return ResponseEntity.ok(proFormas); + } + + @PutMapping("/add") + public ResponseEntity addProForma(@RequestBody ProFormaDto ProFormaDto) { + Integer result = this.proFormaService.create(ProFormaDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editProForma(@RequestBody ProFormaDto ProFormaDto) { + Integer result = this.proFormaService.edit(ProFormaDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteProForma(@PathVariable Long id) { + this.proFormaService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestProFormaStatusController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestProFormaStatusController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestProFormaStatusController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.ProFormaStatusDto; +import mk.ukim.finki.db.distributorapp.service.ProFormaStatusService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/pfStatus") +public class RestProFormaStatusController { + private final ProFormaStatusService proFormaStatusService; + + public RestProFormaStatusController(ProFormaStatusService proFormaStatusService) { + this.proFormaStatusService = proFormaStatusService; + } + + @GetMapping("/all") + public ResponseEntity> getAllProFormaStatuss() { + List statuses = proFormaStatusService.getAllProFormaStatus(); + return ResponseEntity.ok(statuses); + } + + @PutMapping("/add") + public ResponseEntity addProFormaStatus(@RequestBody ProFormaStatusDto ProFormaStatusDto) { + Integer result = this.proFormaStatusService.create(ProFormaStatusDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editProFormaStatus(@RequestBody ProFormaStatusDto ProFormaStatusDto) { + Integer result = this.proFormaStatusService.edit(ProFormaStatusDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteProFormaStatus(@PathVariable Short id) { + this.proFormaStatusService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestRegionController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestRegionController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestRegionController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.RegionDto; +import mk.ukim.finki.db.distributorapp.service.RegionService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/region") +public class RestRegionController { + private final RegionService regionService; + + public RestRegionController(RegionService regionService) { + this.regionService = regionService; + } + + @GetMapping("/all") + public ResponseEntity> getAllRegions() { + List regions = this.regionService.getAllRegions(); + return ResponseEntity.ok(regions); + } + + @PutMapping("/add") + public ResponseEntity addRegion(@RequestBody RegionDto RegionDto) { + Integer result = this.regionService.create(RegionDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editRegion(@RequestBody RegionDto RegionDto) { + Integer result = this.regionService.edit(RegionDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteRegion(@PathVariable Integer id) { + this.regionService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestUsersController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestUsersController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestUsersController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,53 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.UserDto; +import mk.ukim.finki.db.distributorapp.model.entities.Users; +import mk.ukim.finki.db.distributorapp.service.UsersService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; + +@RestController() +@RequestMapping("/rest/users") +public class RestUsersController { + + private final UsersService usersService; + + public RestUsersController(UsersService usersService) { + this.usersService = usersService; + } + + private List buildDto(List users) { + List dtos = new ArrayList<>(); + for (Users user : users) { + UserDto dto = new UserDto( + user.getUserId(), + user.getUsername(), + user.getUserSurname(), + user.getUserEmail(), + user.getUserMobile(), + user.getUserImage(), + user.getCity().getCityId(), + user.getCity().getCityName(), + user.getCity().getRegion().getRegionName(), + user.getUserRole(), + user.getUserResetToken(), + user.getUserResetTokenExpiry(), + user.getClazz_() + ); + dtos.add(dto); + } + return dtos; + } + + @GetMapping("/all") + public ResponseEntity> getAllUsers(){ + List users = this.usersService.findAllUsers(); + return ResponseEntity.ok(buildDto(users)); + } + +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestVehicleController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestVehicleController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestVehicleController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.VehicleDto; +import mk.ukim.finki.db.distributorapp.service.VehicleService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/vehicle") +public class RestVehicleController { + private final VehicleService vehicleService; + + public RestVehicleController(VehicleService vehicleService) { + this.vehicleService = vehicleService; + } + + @GetMapping("/all") + public ResponseEntity> getAllVehicles() { + List vehicles = vehicleService.getAllVehicles(); + return ResponseEntity.ok(vehicles); + } + + @PutMapping("/add") + public ResponseEntity addVehicle(@RequestBody VehicleDto VehicleDto) { + Integer result = this.vehicleService.create(VehicleDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editVehicle(@RequestBody VehicleDto VehicleDto) { + Integer result = this.vehicleService.edit(VehicleDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteVehicle(@PathVariable Integer id) { + this.vehicleService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestWarehouseController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestWarehouseController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestWarehouseController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.WarehouseDto; +import mk.ukim.finki.db.distributorapp.service.WarehouseService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/warehouse") +public class RestWarehouseController { + private final WarehouseService warehouseService; + + public RestWarehouseController(WarehouseService warehouseService) { + this.warehouseService = warehouseService; + } + + @GetMapping("/all") + public ResponseEntity> getAllWarehouses() { + List warehouses = this.warehouseService.getAllWarehouses(); + return ResponseEntity.ok(warehouses); + } + + @PutMapping("/add") + public ResponseEntity addWarehouse(@RequestBody WarehouseDto WarehouseDto) { + Integer result = this.warehouseService.create(WarehouseDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editWarehouse(@RequestBody WarehouseDto WarehouseDto) { + Integer result = this.warehouseService.edit(WarehouseDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteWarehouse(@PathVariable Integer id) { + this.warehouseService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestWeekdayController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestWeekdayController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestWeekdayController.java (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.web.rest; + +import mk.ukim.finki.db.distributorapp.model.dto.WeekdayDto; +import mk.ukim.finki.db.distributorapp.service.WeekdayService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/rest/weekday") +public class RestWeekdayController { + private final WeekdayService weekdayService; + + public RestWeekdayController(WeekdayService weekdayService) { + this.weekdayService = weekdayService; + } + + @GetMapping("/all") + public ResponseEntity> getAllWeekdays(){ + List weekdays = weekdayService.getAllWeekdays(); + return ResponseEntity.ok(weekdays); + } + + @PutMapping("/add") + public ResponseEntity addWeekday(@RequestBody WeekdayDto weekdayDto){ + Integer result = this.weekdayService.create(weekdayDto); + return ResponseEntity.ok(result); + } + + @PutMapping("/edit") + public ResponseEntity editWeekday(@RequestBody WeekdayDto weekdayDto){ + Integer result = this.weekdayService.edit(weekdayDto); + return ResponseEntity.ok(result); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteWeekday(@PathVariable Short id){ + this.weekdayService.deleteById(id); + return ResponseEntity.noContent().build(); + } +} Index: backend/src/main/resources/application.properties =================================================================== --- backend/src/main/resources/application.properties (revision e460df4299a6db865fb9d69b08139d9e484db719) +++ backend/src/main/resources/application.properties (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -1,3 +1,3 @@ spring.application.name=DistributorApp -spring.profiles.active=prod +spring.profiles.active=test Index: backend/src/main/resources/templates/all-drivers.html =================================================================== --- backend/src/main/resources/templates/all-drivers.html (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/resources/templates/all-drivers.html (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,10 @@ + + + + + Title + + + + + Index: backend/src/main/resources/templates/all-managers.html =================================================================== --- backend/src/main/resources/templates/all-managers.html (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/resources/templates/all-managers.html (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,10 @@ + + + + + Title + + + + + Index: backend/src/main/resources/templates/authentication/access_denied.html =================================================================== --- backend/src/main/resources/templates/authentication/access_denied.html (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/resources/templates/authentication/access_denied.html (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,10 @@ + + + + + Title + + +Error + + Index: backend/src/main/resources/templates/authentication/changePass.html =================================================================== --- backend/src/main/resources/templates/authentication/changePass.html (revision cde148577250f78444c556d55e9d413e9f369cfc) +++ backend/src/main/resources/templates/authentication/changePass.html (revision cde148577250f78444c556d55e9d413e9f369cfc) @@ -0,0 +1,36 @@ + + + + + Change Password + + + +

+ +

+ + +

+ +

+ + +

+ +

Welcome to Our Application

If you have an account, please log in. Otherwise, register to get started.

- -

Welcome, Customer!

View your orders, account details, and more.

Welcome, Driver!

View your assigned deliveries and schedules.

Welcome, Manager!

Assign deliveries, manage deliveries, and monitor progress.

Change Password

Reset Password

Reset Password

Welcome to Our Application

Welcome to the Home Page

Welcome to the Home Page

Welcome to the Home Page

Welcome to the Home Page

Welcome, Customer!

Welcome, Driver!

Welcome, Manager!

Change Password

Sign in

Register as a Customer

Reset Password

Reset Password

Create a Driver

Create a Manager

Welcome to Our Application

Welcome to the Home Page

Welcome to the Home Page

Welcome to the Home Page

Welcome to the Home Page

Sign in

Register

Welcome, Customer!

Welcome, Driver!

Welcome, Manager!