Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/config/CustomUserDetailsService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/config/CustomUserDetailsService.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/config/CustomUserDetailsService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.config; -import mk.ukim.finki.db.distributorapp.model.Users; +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; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/config/SecurityConfig.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/config/SecurityConfig.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/config/SecurityConfig.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -22,4 +22,22 @@ } + // 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 { @@ -58,4 +76,8 @@ } + **/ + + + @Bean public AuthenticationManager authManager(AuthenticationConfiguration authConfig) throws Exception { Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Article.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Article.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,45 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.util.List; - -@Entity -@Data -@Table(name = "article", schema = "IND0_185022") -public class Article { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "art_id", nullable = false) - @JsonProperty("articleId") - private Long articleId; - - @Column(name = "art_name", nullable = false) - @JsonProperty("articleName") - private String articleName; - - @Column(name = "art_weight", nullable = false) - @JsonProperty("articleWeight") - private Integer articleWeight; - - @Column(name = "art_image", nullable = false) - @JsonProperty("articleImage") - private String artImage; - - @ManyToOne - @JoinColumn(name = "ctg_id", nullable = false) - private Category category; - - @ManyToOne - @JoinColumn(name = "man_id", nullable = false) - private Manufacturer manufacturer; - - @OneToMany(mappedBy = "article") - private List prices; - - @OneToMany(mappedBy = "article") - private List articleUnits; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/ArticleUnit.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ArticleUnit.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,49 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.util.Date; - -@Entity -@Data -@Table(name = "article_unit", schema = "IND0_185022") -public class ArticleUnit { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonProperty("unitId") - private Long unitId; - - @Column(name = "unit_expiration_date", nullable = false) - @JsonProperty("unitExpirationDate") - private Date unitExpirationDate; - - @Column(name = "unit_serial_number", nullable = false) - @JsonProperty("unitSerialNumber") - private String unitSerialNumber; - - @Column(name = "unit_batch_number", nullable = false) - @JsonProperty("unitBatchNumber") - private String unitBatchNumber; - - @Column(name = "unit_manufacture_date", nullable = false) - @JsonProperty("unitManufactureDate") - private Date unitManufactureDate; - - @Column(name = "unit_cost_price", nullable = false) - @JsonProperty("unitCostPrice") - private Double unitCostPrice; - - @ManyToOne - @JoinColumn(name = "art_id", nullable = false) - private Article article; - - @ManyToOne - @JoinColumn(name = "wh_id", nullable = false) - private Warehouse warehouse; - - @ManyToOne - @JoinColumn(name = "ord_id") - private Orders order; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Category.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Category.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,27 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.util.List; - -@Entity(name = "Category") -@Data -@Table(name = "category", schema = "IND0_185022") -public class Category { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ctg_id") - @JsonProperty("categoryId") - private Long categoryId; - - @Column(name = "ctg_name", nullable = false) - @JsonProperty("categoryName") - private String categoryName; - - @OneToMany(mappedBy = "category") - private List
articles; - - -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/City.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/City.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,33 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.util.List; - -@Entity -@Data -@Table(name = "city", schema = "IND0_185022") -public class City { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "city_id") - @JsonProperty("cityId") - private Long cityId; - - @Column(name = "city_name", nullable = false) - @JsonProperty("cityName") - private String cityName; - - @OneToMany(mappedBy = "city") - private List users; - - @OneToOne(mappedBy = "city") - private Warehouse warehouse; - - @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "region_id", nullable = false) - private Region region; - -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Customer.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Customer.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,45 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.time.LocalTime; -import java.util.List; - -@EqualsAndHashCode(callSuper = true) -@Entity -@Data -@Table(name = "customer", schema = "IND0_185022") -public class Customer extends Users { - @Column(name = "cust_EDB", nullable = false, length = 13) - @JsonProperty("customerEDB") - private String customerEDB; - - @Column(name = "cust_company_name", nullable = false) - @JsonProperty("customerCompanyName") - private String customerCompanyName; - - @Column(name = "cust_address", nullable = false) - @JsonProperty("customerAddress") - private String customerAddress; - - @Column(name = "cust_open_time", nullable = false) - @JsonProperty("customerOpenDate") - private LocalTime customerOpenTime; - - @Column(name = "cust_close_time", nullable = false) - @JsonProperty("customerCloseTime") - private LocalTime customerCloseTime; - - @Column(name = "cust_representative_img", nullable = false) - @JsonProperty("customerRepresentativeImage") - private String customerRepresentativeImage; - - @OneToMany(mappedBy = "customer") - private List orders; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/CustomerWeekday.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/CustomerWeekday.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,35 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalTime; - -@Getter -@Setter -@Entity -@Table(name = "customer_weekday", schema = "IND0_185022") -public class CustomerWeekday { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "cust_day_id", nullable = false) - @JsonProperty("customerDayId") - private Long customerDayId; - - @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "cust_id", nullable = false) - private Customer customer; - - @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "day_id", nullable = false) - private Weekday day; - - @Column(name = "start_time", nullable = false) - private LocalTime customerDayStartTime; - - @Column(name = "end_time", nullable = false) - private LocalTime customerDayEndTime; - -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,55 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.time.LocalDate; -import java.time.LocalTime; -import java.util.List; - -@Entity -@Data -@Table(name = "delivery", schema = "IND0_185022") -public class Delivery { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "del_id") - @JsonProperty("deliveryId") - private Long deliveryId; - - @Column(name = "del_date_created", nullable = false) - @JsonProperty("deliveryDateCreated") - private LocalDate deliveryDateCreated; - - @Column(name = "del_date", nullable = false) - @JsonProperty("deliveryDate") - private LocalDate deliveryDate; - - @Column(name = "del_start_km") - @JsonProperty("deliveryStartKm") - private Integer deliveryStartKm; - - @Column(name = "del_end_km") - @JsonProperty("deliveryEndKm") - private Integer deliveryEndKm; - - @Column(name = "del_start_time") - @JsonProperty("deliveryStartTime") - private LocalTime deliveryStartTime; - - @Column(name = "del_end_time") - @JsonProperty("deliveryEndTime") - private LocalTime deliveryEndTime; - - @ManyToOne - @JoinColumn(name = "del_status_id", nullable = false) - private DeliveryStatus deliveryStatus; - - @ManyToOne - @JoinColumn(name = "veh_id", nullable = false) - private Vehicle vehicle; - - @OneToMany(mappedBy = "delivery") - private List orders; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/DeliveryStatus.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/DeliveryStatus.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,28 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.util.List; - -@Entity -@Data -public class DeliveryStatus { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "del_status_id") - @JsonProperty("deliveryStatusId") - private Short deliveryStatusId; - - @Column(name = "del_status_name", nullable = false) - @JsonProperty("deliveryStatusName") - private String deliveryStatusName; - - @Column(name = "del_status_desc", nullable = false) - @JsonProperty("deliveryStatusDescription") - private String deliveryStatusDescription; - - @OneToMany(mappedBy = "deliveryStatus") - private List deliveries; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Driver.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Driver.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,18 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.OneToOne; -import jakarta.persistence.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@EqualsAndHashCode(callSuper = true) -@Entity -@Data -@Table(name = "driver", schema = "IND0_185022") -public class Driver extends Users { - @OneToOne - @JoinColumn(name = "veh_id", nullable = false) - private Vehicle vehicle; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Manager.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Manager.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,18 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.OneToOne; -import jakarta.persistence.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@EqualsAndHashCode(callSuper = true) -@Entity -@Data -@Table(name = "manager", schema = "IND0_185022") -public class Manager extends Users { - @OneToOne - @JoinColumn(name = "wh_id", nullable = false, unique = true) - private Warehouse warehouse; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Manufacturer.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Manufacturer.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,37 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.util.List; - -@Entity -@Data -@Table(name = "manufacturer", schema = "IND0_185022") -public class Manufacturer { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "man_id") - @JsonProperty("manufacturerId") - private Long manufacturerId; - - @Column(name = "man_name", nullable = false) - @JsonProperty("manufacturerName") - private String manufacturerName; - - @Column(name = "man_address", nullable = false) - @JsonProperty("manufacturerAddress") - private String manufacturerAddress; - - @Column(name = "man_mobile", nullable = false) - @JsonProperty("manufacturerMobile") - private String manufacturerMobile; - - @Column(name = "man_email", nullable = false) - @JsonProperty("manufacturerEmail") - private String manufacturerEmail; - - @OneToMany(mappedBy = "manufacturer") - private List
articles; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/OrderStatus.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/OrderStatus.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,28 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.util.List; - -@Entity -@Data -public class OrderStatus { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ord_status_id") - @JsonProperty("orderStatusId") - private Short orderStatusId; - - @Column(name = "ord_status_name", nullable = false) - @JsonProperty("orderStatusName") - private String orderStatusName; - - @Column(name = "ord_status_desc", nullable = false) - @JsonProperty("orderStatusDescription") - private String orderStatusDescription; - - @OneToMany(mappedBy = "orderStatus") - private List orders; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,55 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - -@Entity -@Data -@Table(name = "orders", schema = "IND0_185022") -public class Orders { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ord_id", nullable = false) - @JsonProperty("orderId") - private Long orderId; - - @Column(name = "ord_date", nullable = false) - @JsonProperty("orderDate") - private LocalDate orderDate; - - @Column(name = "ord_sum", nullable = false) - @JsonProperty("orderSum") - private Integer orderSum; - - @Column(name = "ord_fulfillment_date") - @JsonProperty("orderFulfillmentDate") - private LocalDateTime orderFulfillmentDate; - - @Column(name = "ord_comment") - @JsonProperty("orderComment") - private String orderComment; - - @ManyToOne - @JoinColumn(name = "ord_status_id",nullable = false) - private OrderStatus orderStatus; - - @ManyToOne - @JoinColumn(name = "cust_id") - private Customer customer; - - @ManyToOne - @JoinColumn(name = "del_id", nullable = false) - private Delivery delivery; - - @OneToOne - @JoinColumn(name = "pf_id", nullable = false, unique = true) - private ProForma proForma; - - @OneToMany(mappedBy = "order") - private List articleUnits; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Price.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Price.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,32 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -@Entity -@Data -@Table(name = "price", schema = "IND0_185022") -public class Price { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "price_id") - @JsonProperty("priceId") - private Integer priceId; - - @Column(name = "price", nullable = false) - @JsonProperty("price") - private BigDecimal price; - - @Column(name = "price_eff_date", nullable = false) - @JsonProperty("priceEffectiveDate") - private LocalDateTime priceEffectiveDate; - - @ManyToOne - @JoinColumn(name = "art_id", nullable = false) - private Article article; - -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProForma.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProForma.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,33 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.time.LocalDate; - -@Entity -@Data -@Table(name = "pro_forma", schema = "IND0_185022") -public class ProForma { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "pf_id") - @JsonProperty("proFormaId") - private Long proFormaId; - - @Column(name = "pf_deadline", nullable = false) - @JsonProperty("proFormaDeadline") - private LocalDate proFormaDeadline; - - @Column(name = "pf_date_created", nullable = false) - @JsonProperty("proFormaDateCreated") - private LocalDate proFormaDateCreated; - - @ManyToOne - @JoinColumn(name = "pf_status_id", nullable = false) - private ProFormaStatus proFormaStatus; - - @OneToOne(mappedBy = "proForma") - private Orders order; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProFormaStatus.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProFormaStatus.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,28 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.util.List; - -@Entity -@Data -public class ProFormaStatus { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "pf_status_id") - @JsonProperty("proFormaStatusId") - private Short proFormaStatusId; - - @Column(name = "pf_status_name", nullable = false) - @JsonProperty("proFormaStatusName") - private String proFormaStatusName; - - @Column(name = "pf_status_desc", nullable = false) - @JsonProperty("proFormaStatusDescription") - private String proFormaStatusDescription; - - @OneToMany(mappedBy = "proFormaStatus") - private List pro_formas; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Region.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Region.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,26 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.util.List; - -@Entity -@Data -@Table(name = "region", schema = "IND0_185022") -public class Region { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "region_id", nullable = false) - @JsonProperty("regionId") - private Integer regionId; - - @Column(name = "region_name", nullable = false) - @JsonProperty("regionName") - private String regionName; - - @OneToMany(mappedBy = "region") - private List cities; - -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Users.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Users.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,87 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - -import java.util.Collection; -import java.util.List; - -@Entity -@NoArgsConstructor -@AllArgsConstructor -@Inheritance(strategy = InheritanceType.JOINED) -@Data -@Table(name = "users", schema = "IND0_185022") -public class Users implements UserDetails { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long userId; - - @Column(name = "user_name", nullable = false) - private String userName; - - @Column(name = "user_surname", nullable = false) - private String userSurname; - - @Column(name = "user_pass", nullable = false) - private String userPassword; - - @Column(name = "user_email", nullable = false) - private String userEmail; - - @Column(name = "user_mobile", nullable = false) - private String userMobile; - - @Column(name = "user_salt", nullable = false) - private String userSalt; - - @Column(name = "user_email_conf", nullable = false) - private Boolean userActive; - - @Column(name = "user_image") - private String userImage; - - @ManyToOne - @JoinColumn(name = "city_id", nullable = false) - private City city; - - @Override - public String getUsername() { - return userEmail; - } - - @Override - public String getPassword() { - return userPassword; - } - - @Override - public Collection getAuthorities() { - return List.of(new SimpleGrantedAuthority(this.getClass().getSimpleName())); - } - - @Override - public boolean isAccountNonExpired() { - return true; - } - - @Override - public boolean isAccountNonLocked() { - return true; - } - - @Override - public boolean isCredentialsNonExpired() { - return true; - } - - @Override - public boolean isEnabled() { - return userActive; - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Vehicle.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Vehicle.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,61 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.time.LocalDate; -import java.util.List; - -@Entity -@Data -@Table(name = "vehicle", schema = "IND0_185022") -public class Vehicle { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "veh_id") - @JsonProperty("vehicleId") - private Integer vehicleId; - - @Column(name = "veh_carry_weight", nullable = false) - @JsonProperty("vehicleCarryWeight") - private Integer vehicleCarryWeight; - - @Column(name = "veh_service_interval", nullable = false) - @JsonProperty("vehicleServiceInterval") - private Short vehicleServiceInterval; - - @Column(name = "veh_kilometers", nullable = false) - @JsonProperty("vehicleKilometers") - private Integer vehicleKilometers; - - @Column(name = "veh_last_service") - @JsonProperty("vehicleLastService") - private LocalDate vehicleLastService; - - @Column(name = "veh_last_service_km") - @JsonProperty("vehicleLastServiceKm") - private Integer vehicleLastServiceKm; - - @Column(name = "veh_plate", nullable = false, length = 8) - @JsonProperty("vehiclePlate") - private String vehiclePlate; - - @Column(name = "veh_vin", nullable = false, length = 17) - @JsonProperty("vehicleVin") - private String vehicleVin; - - @Column(name = "veh_reg", nullable = false) - @JsonProperty("vehicleRegDate") - private LocalDate vehicleRegDate; - - @ManyToOne - @JoinColumn(name = "wh_id", nullable = false) - private Warehouse warehouse; - - @OneToOne(mappedBy = "vehicle") - private Driver driver; - - @OneToMany(mappedBy = "vehicle") - private List deliveries; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Warehouse.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Warehouse.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,35 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Data; - -import java.util.List; - -@Entity -@Data -@Table(name = "warehouse", schema = "IND0_185022") -public class Warehouse { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "wh_id") - @JsonProperty("warehouseId") - private Integer warehouseId; - - @Column(name = "wh_address", nullable = false) - @JsonProperty("warehouseAddress") - private String warehouseAddress; - - @OneToOne - @JoinColumn(name = "city_id", unique = true, nullable = false) - private City city; - - @OneToOne(mappedBy = "warehouse") - private Manager manager; - - @OneToMany(mappedBy = "warehouse") - private List vehicles; - - @OneToMany(mappedBy = "warehouse") - private List articleUnits; -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/Weekday.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Weekday.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,28 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.persistence.*; -import lombok.Getter; -import lombok.Setter; - -import java.util.LinkedHashSet; -import java.util.Set; - -@Getter -@Setter -@Entity -@Table(name = "weekday", schema = "IND0_185022") -public class Weekday { - @Id - @Column(name = "day_id", nullable = false) - @JsonProperty("weekdayId") - private Short id; - - @Column(name = "day_name", nullable = false, length = 20) - @JsonProperty("dayName") - private String dayName; - - @OneToMany(mappedBy = "day") - private Set customerWeekdays = new LinkedHashSet<>(); - -} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ArticleDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ArticleDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ArticleDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,17 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ArticleDto { + Long id; + String name; + String manufacturer; + String category; + Integer weight; + String image; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ArticleUnitDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ArticleUnitDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ArticleUnitDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,7 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.Data; + +@Data +public class ArticleUnitDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CategoryDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CategoryDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CategoryDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -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 CategoryDto { + private Long id; + private String name; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CityDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,10 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.Data; + +@Data +public class CityDto { + private Long id; + private String name; + private String regionName; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CustomerDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CustomerDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CustomerDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class CustomerDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CustomerWeekdayDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CustomerWeekdayDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/CustomerWeekdayDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class CustomerWeekdayDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class DeliveryDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryStatusDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryStatusDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryStatusDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class DeliveryStatusDto { +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DriverDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class DriverDto { +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ManagerDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class ManagerDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ManufacturerDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ManufacturerDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ManufacturerDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class ManufacturerDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrderStatusDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrderStatusDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrderStatusDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class OrderStatusDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrdersDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrdersDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrdersDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class OrdersDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/PriceDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/PriceDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/PriceDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class PriceDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ProFormaDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ProFormaDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ProFormaDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class ProFormaDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ProFormaStatusDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ProFormaStatusDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/ProFormaStatusDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class ProFormaStatusDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/RegionDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/RegionDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/RegionDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,9 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.Data; + +@Data +public class RegionDto { + public Integer id; + public String name; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/UserDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,11 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.Data; + +@Data +public class UserDto { + private Long id; + private String firstName; + private String lastName; + private String email; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/UsersDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/UsersDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/UsersDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class UsersDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/VehicleDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/VehicleDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/VehicleDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class VehicleDto { +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WarehouseDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class WarehouseDto { +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WeekdayDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WeekdayDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WeekdayDto.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,4 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +public class WeekdayDto { +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Article.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,50 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.util.List; + +@Entity +@Data +@Table(name = "article") +public class Article { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "art_id", nullable = false) + @JsonProperty("articleId") + private Long articleId; + + @Column(name = "art_name", nullable = false) + @JsonProperty("articleName") + private String articleName; + + @Column(name = "art_weight", nullable = false) + @JsonProperty("articleWeight") + private Integer articleWeight; + + @Column(name = "art_image", nullable = false) + @JsonProperty("articleImage") + private String artImage; + + @ManyToOne + @JoinColumn(name = "ctg_id", nullable = false) + @JsonProperty("category") + private Category category; + + @ManyToOne + @JoinColumn(name = "man_id", nullable = false) + @JsonProperty("manufacturer") + private Manufacturer manufacturer; + + @OneToMany(mappedBy = "article") + @JsonIgnore + private List prices; + + @OneToMany(mappedBy = "article") + @JsonIgnore + private List articleUnits; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ArticleUnit.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,51 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.util.Date; + +@Entity +@Data +@Table(name = "article_unit") +public class ArticleUnit { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @JsonProperty("unitId") + private Long unitId; + + @Column(name = "unit_expiration_date", nullable = false) + @JsonProperty("unitExpirationDate") + private Date unitExpirationDate; + + @Column(name = "unit_serial_number", nullable = false) + @JsonProperty("unitSerialNumber") + private String unitSerialNumber; + + @Column(name = "unit_batch_number", nullable = false) + @JsonProperty("unitBatchNumber") + private String unitBatchNumber; + + @Column(name = "unit_manufacture_date", nullable = false) + @JsonProperty("unitManufactureDate") + private Date unitManufactureDate; + + @Column(name = "unit_cost_price", nullable = false) + @JsonProperty("unitCostPrice") + private Double unitCostPrice; + + @ManyToOne + @JoinColumn(name = "art_id", nullable = false) + @JsonIgnore + private Article article; + + @ManyToOne + @JsonIgnore + private Warehouse warehouse; + + @ManyToOne + @JsonIgnore + private Orders order; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Category.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,29 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.util.List; + +@Entity(name = "Category") +@Data +@Table(name = "category") +public class Category { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ctg_id") + @JsonProperty("categoryId") + private Long categoryId; + + @Column(name = "ctg_name", nullable = false) + @JsonProperty("categoryName") + private String categoryName; + + @OneToMany(mappedBy = "category") + @JsonIgnore + private List
articles; + + +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/City.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,33 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.util.List; + +@Entity +@Data +@Table(name = "city") +public class City { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "city_id") + @JsonProperty("cityId") + private Long cityId; + + @Column(name = "city_name", nullable = false) + @JsonProperty("cityName") + private String cityName; + + @OneToMany(mappedBy = "city") + private List users; + + @OneToOne(mappedBy = "city") + private Warehouse warehouse; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "region_id", nullable = false) + private Region region; + +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Customer.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.time.LocalTime; +import java.util.List; + +@EqualsAndHashCode(callSuper = true) +@Entity +@Data +@Table(name = "customer") +public class Customer extends Users { + @Column(name = "cust_EDB", nullable = false, length = 13) + @JsonProperty("customerEDB") + private String customerEDB; + + @Column(name = "cust_company_name", nullable = false) + @JsonProperty("customerCompanyName") + private String customerCompanyName; + + @Column(name = "cust_address", nullable = false) + @JsonProperty("customerAddress") + private String customerAddress; + + @Column(name = "cust_open_time", nullable = false) + @JsonProperty("customerOpenDate") + private LocalTime customerOpenTime; + + @Column(name = "cust_close_time", nullable = false) + @JsonProperty("customerCloseTime") + private LocalTime customerCloseTime; + + @Column(name = "cust_representative_img", nullable = false) + @JsonProperty("customerRepresentativeImage") + private String customerRepresentativeImage; + + @OneToMany(mappedBy = "customer") + private List orders; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/CustomerWeekday.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,35 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalTime; + +@Getter +@Setter +@Entity +@Table(name = "customer_weekday") +public class CustomerWeekday { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "cust_day_id", nullable = false) + @JsonProperty("customerDayId") + private Long customerDayId; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "cust_id", nullable = false) + private Customer customer; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "day_id", nullable = false) + private Weekday day; + + @Column(name = "start_time", nullable = false) + private LocalTime customerDayStartTime; + + @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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Delivery.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,55 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.time.LocalDate; +import java.time.LocalTime; +import java.util.List; + +@Entity +@Data +@Table(name = "delivery") +public class Delivery { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "del_id") + @JsonProperty("deliveryId") + private Long deliveryId; + + @Column(name = "del_date_created", nullable = false) + @JsonProperty("deliveryDateCreated") + private LocalDate deliveryDateCreated; + + @Column(name = "del_date", nullable = false) + @JsonProperty("deliveryDate") + private LocalDate deliveryDate; + + @Column(name = "del_start_km") + @JsonProperty("deliveryStartKm") + private Integer deliveryStartKm; + + @Column(name = "del_end_km") + @JsonProperty("deliveryEndKm") + private Integer deliveryEndKm; + + @Column(name = "del_start_time") + @JsonProperty("deliveryStartTime") + private LocalTime deliveryStartTime; + + @Column(name = "del_end_time") + @JsonProperty("deliveryEndTime") + private LocalTime deliveryEndTime; + + @ManyToOne + @JoinColumn(name = "del_status_id", nullable = false) + private DeliveryStatus deliveryStatus; + + @ManyToOne + @JoinColumn(name = "veh_id", nullable = false) + private Vehicle vehicle; + + @OneToMany(mappedBy = "delivery") + private List orders; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/DeliveryStatus.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,28 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.util.List; + +@Entity +@Data +public class DeliveryStatus { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "del_status_id") + @JsonProperty("deliveryStatusId") + private Short deliveryStatusId; + + @Column(name = "del_status_name", nullable = false) + @JsonProperty("deliveryStatusName") + private String deliveryStatusName; + + @Column(name = "del_status_desc", nullable = false) + @JsonProperty("deliveryStatusDescription") + private String deliveryStatusDescription; + + @OneToMany(mappedBy = "deliveryStatus") + private List deliveries; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Driver.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,15 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import jakarta.persistence.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Entity +@Data +@Table(name = "driver") +public class Driver extends Users { + @OneToOne + @JoinColumn(name = "veh_id", nullable = false) + private Vehicle vehicle; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Manager.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,15 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import jakarta.persistence.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Entity +@Data +@Table(name = "manager") +public class Manager extends Users { + @OneToOne + @JoinColumn(name = "wh_id", nullable = false, unique = true) + private Warehouse warehouse; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Manufacturer.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,37 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.util.List; + +@Entity +@Data +@Table(name = "manufacturer") +public class Manufacturer { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "man_id") + @JsonProperty("manufacturerId") + private Long manufacturerId; + + @Column(name = "man_name", nullable = false) + @JsonProperty("manufacturerName") + private String manufacturerName; + + @Column(name = "man_address", nullable = false) + @JsonProperty("manufacturerAddress") + private String manufacturerAddress; + + @Column(name = "man_mobile", nullable = false) + @JsonProperty("manufacturerMobile") + private String manufacturerMobile; + + @Column(name = "man_email", nullable = false) + @JsonProperty("manufacturerEmail") + private String manufacturerEmail; + + @OneToMany(mappedBy = "manufacturer") + private List
articles; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/OrderStatus.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,28 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.util.List; + +@Entity +@Data +public class OrderStatus { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ord_status_id") + @JsonProperty("orderStatusId") + private Short orderStatusId; + + @Column(name = "ord_status_name", nullable = false) + @JsonProperty("orderStatusName") + private String orderStatusName; + + @Column(name = "ord_status_desc", nullable = false) + @JsonProperty("orderStatusDescription") + private String orderStatusDescription; + + @OneToMany(mappedBy = "orderStatus") + private List orders; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Orders.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,55 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +@Entity +@Data +@Table(name = "orders") +public class Orders { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ord_id", nullable = false) + @JsonProperty("orderId") + private Long orderId; + + @Column(name = "ord_date", nullable = false) + @JsonProperty("orderDate") + private LocalDate orderDate; + + @Column(name = "ord_sum", nullable = false) + @JsonProperty("orderSum") + private Integer orderSum; + + @Column(name = "ord_fulfillment_date") + @JsonProperty("orderFulfillmentDate") + private LocalDateTime orderFulfillmentDate; + + @Column(name = "ord_comment") + @JsonProperty("orderComment") + private String orderComment; + + @ManyToOne + @JoinColumn(name = "ord_status_id",nullable = false) + private OrderStatus orderStatus; + + @ManyToOne + @JoinColumn(name = "cust_id") + private Customer customer; + + @ManyToOne + @JoinColumn(name = "del_id", nullable = false) + private Delivery delivery; + + @OneToOne + @JoinColumn(name = "pf_id", nullable = false, unique = true) + private ProForma proForma; + + @OneToMany(mappedBy = "order") + private List articleUnits; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Price.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,32 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Entity +@Data +@Table(name = "price") +public class Price { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "price_id") + @JsonProperty("priceId") + private Integer priceId; + + @Column(name = "price", nullable = false) + @JsonProperty("price") + private BigDecimal price; + + @Column(name = "price_eff_date", nullable = false) + @JsonProperty("priceEffectiveDate") + private LocalDateTime priceEffectiveDate; + + @ManyToOne + @JoinColumn(name = "art_id", nullable = false) + private Article article; + +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ProForma.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,33 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.time.LocalDate; + +@Entity +@Data +@Table(name = "pro_forma") +public class ProForma { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "pf_id") + @JsonProperty("proFormaId") + private Long proFormaId; + + @Column(name = "pf_deadline", nullable = false) + @JsonProperty("proFormaDeadline") + private LocalDate proFormaDeadline; + + @Column(name = "pf_date_created", nullable = false) + @JsonProperty("proFormaDateCreated") + private LocalDate proFormaDateCreated; + + @ManyToOne + @JoinColumn(name = "pf_status_id", nullable = false) + private ProFormaStatus proFormaStatus; + + @OneToOne(mappedBy = "proForma") + private Orders order; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/ProFormaStatus.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,28 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.util.List; + +@Entity +@Data +public class ProFormaStatus { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "pf_status_id") + @JsonProperty("proFormaStatusId") + private Short proFormaStatusId; + + @Column(name = "pf_status_name", nullable = false) + @JsonProperty("proFormaStatusName") + private String proFormaStatusName; + + @Column(name = "pf_status_desc", nullable = false) + @JsonProperty("proFormaStatusDescription") + private String proFormaStatusDescription; + + @OneToMany(mappedBy = "proFormaStatus") + private List pro_formas; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Region.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,26 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.util.List; + +@Entity +@Data +@Table(name = "region") +public class Region { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "region_id", nullable = false) + @JsonProperty("regionId") + private Integer regionId; + + @Column(name = "region_name", nullable = false) + @JsonProperty("regionName") + private String regionName; + + @OneToMany(mappedBy = "region") + private List cities; + +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Users.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,87 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; +import java.util.List; + +@Entity +@AllArgsConstructor +@NoArgsConstructor +@Inheritance(strategy = InheritanceType.JOINED) +@Data +@Table(name = "users") +public class Users implements UserDetails { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long userId; + + @Column(name = "user_name", nullable = false) + private String userName; + + @Column(name = "user_surname", nullable = false) + private String userSurname; + + @Column(name = "user_pass", nullable = false) + private String userPassword; + + @Column(name = "user_email", nullable = false) + private String userEmail; + + @Column(name = "user_mobile", nullable = false) + private String userMobile; + + @Column(name = "user_salt", nullable = false) + private String userSalt; + + @Column(name = "user_active", nullable = false) + private Boolean userActive; + + @Column(name = "user_image") + private String userImage; + + @ManyToOne + @JoinColumn(name = "city_id", nullable = false) + private City city; + + @Override + public String getUsername() { + return userEmail; + } + + @Override + public String getPassword() { + return userPassword; + } + + @Override + public Collection getAuthorities() { + return List.of(new SimpleGrantedAuthority(this.getClass().getSimpleName())); + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return userActive; + } +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Vehicle.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,61 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.time.LocalDate; +import java.util.List; + +@Entity +@Data +@Table(name = "vehicle") +public class Vehicle { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "veh_id") + @JsonProperty("vehicleId") + private Integer vehicleId; + + @Column(name = "veh_carry_weight", nullable = false) + @JsonProperty("vehicleCarryWeight") + private Integer vehicleCarryWeight; + + @Column(name = "veh_service_interval", nullable = false) + @JsonProperty("vehicleServiceInterval") + private Short vehicleServiceInterval; + + @Column(name = "veh_kilometers", nullable = false) + @JsonProperty("vehicleKilometers") + private Integer vehicleKilometers; + + @Column(name = "veh_last_service") + @JsonProperty("vehicleLastService") + private LocalDate vehicleLastService; + + @Column(name = "veh_last_service_km") + @JsonProperty("vehicleLastServiceKm") + private Integer vehicleLastServiceKm; + + @Column(name = "veh_plate", nullable = false, length = 8) + @JsonProperty("vehiclePlate") + private String vehiclePlate; + + @Column(name = "veh_vin", nullable = false, length = 17) + @JsonProperty("vehicleVin") + private String vehicleVin; + + @Column(name = "veh_reg", nullable = false) + @JsonProperty("vehicleRegDate") + private LocalDate vehicleRegDate; + + @ManyToOne + @JoinColumn(name = "wh_id", nullable = false) + private Warehouse warehouse; + + @OneToOne(mappedBy = "vehicle") + private Driver driver; + + @OneToMany(mappedBy = "vehicle") + private List deliveries; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Warehouse.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,35 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Data; + +import java.util.List; + +@Entity +@Data +@Table(name = "warehouse") +public class Warehouse { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "wh_id") + @JsonProperty("warehouseId") + private Integer warehouseId; + + @Column(name = "wh_address", nullable = false) + @JsonProperty("warehouseAddress") + private String warehouseAddress; + + @OneToOne + @JoinColumn(name = "city_id", unique = true, nullable = false) + private City city; + + @OneToOne(mappedBy = "warehouse") + private Manager manager; + + @OneToMany(mappedBy = "warehouse") + private List vehicles; + + @OneToMany(mappedBy = "warehouse") + private List articleUnits; +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/entities/Weekday.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,28 @@ +package mk.ukim.finki.db.distributorapp.model.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +import java.util.LinkedHashSet; +import java.util.Set; + +@Getter +@Setter +@Entity +@Table(name = "weekday") +public class Weekday { + @Id + @Column(name = "day_id", nullable = false) + @JsonProperty("weekdayId") + private Short id; + + @Column(name = "day_name", nullable = false, length = 20) + @JsonProperty("dayName") + private String dayName; + + @OneToMany(mappedBy = "day") + private Set customerWeekdays = new LinkedHashSet<>(); + +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/CategoryMapper.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/CategoryMapper.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/CategoryMapper.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,13 @@ +package mk.ukim.finki.db.distributorapp.model.mapper; + +import mk.ukim.finki.db.distributorapp.model.dto.CategoryDto; +import mk.ukim.finki.db.distributorapp.model.entities.Category; + +public class CategoryMapper { + private static CategoryDto toCategoryDto(Category category) { + CategoryDto categoryDto = new CategoryDto(); + categoryDto.setId(category.getCategoryId()); + categoryDto.setName(category.getCategoryName()); + return categoryDto; + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/CityMapper.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/CityMapper.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/CityMapper.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,13 @@ +package mk.ukim.finki.db.distributorapp.model.mapper; + +import mk.ukim.finki.db.distributorapp.model.dto.CityDto; +import mk.ukim.finki.db.distributorapp.model.entities.City; + +public class CityMapper { + public static CityDto toCityDto(City city) { + CityDto cityDto = new CityDto(); + cityDto.setId(city.getCityId()); + cityDto.setName(city.getCityName()); + return cityDto; + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/RegionMapper.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/RegionMapper.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/RegionMapper.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,13 @@ +package mk.ukim.finki.db.distributorapp.model.mapper; + +import mk.ukim.finki.db.distributorapp.model.dto.RegionDto; +import mk.ukim.finki.db.distributorapp.model.entities.Region; + +public class RegionMapper { + public static RegionDto toRegionDto(Region region) { + RegionDto regionDto = new RegionDto(); + regionDto.setId(region.getRegionId()); + regionDto.setName(region.getRegionName()); + return regionDto; + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/UserMapper.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/UserMapper.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/mapper/UserMapper.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,15 @@ +package mk.ukim.finki.db.distributorapp.model.mapper; + +import mk.ukim.finki.db.distributorapp.model.dto.UserDto; +import mk.ukim.finki.db.distributorapp.model.entities.Users; + +public class UserMapper { + public static UserDto toUserDto(Users user) { + UserDto userDto = new UserDto(); + userDto.setId(user.getUserId()); + userDto.setFirstName(userDto.getFirstName()); + userDto.setLastName(userDto.getLastName()); + userDto.setEmail(userDto.getEmail()); + return userDto; + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleRepository.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Article; +import mk.ukim.finki.db.distributorapp.model.entities.Article; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -16,6 +16,5 @@ @Query( nativeQuery = true, - value = "select * " + - "from article" + value = "select * from article" ) List
listAll(); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleUnitRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleUnitRepository.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleUnitRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.ArticleUnit; +import mk.ukim.finki.db.distributorapp.model.entities.ArticleUnit; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CategoryRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CategoryRepository.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CategoryRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Category; +import mk.ukim.finki.db.distributorapp.model.entities.Category; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CityRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.City; +import mk.ukim.finki.db.distributorapp.model.entities.City; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CustomerRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Customer; +import mk.ukim.finki.db.distributorapp.model.entities.Customer; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Delivery; +import mk.ukim.finki.db.distributorapp.model.entities.Delivery; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryStatusRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryStatusRepository.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryStatusRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.DeliveryStatus; +import mk.ukim.finki.db.distributorapp.model.entities.DeliveryStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Driver; +import mk.ukim.finki.db.distributorapp.model.entities.Driver; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManagerRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Manager; +import mk.ukim.finki.db.distributorapp.model.entities.Manager; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManufacturerRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManufacturerRepository.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManufacturerRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Manufacturer; +import mk.ukim.finki.db.distributorapp.model.entities.Manufacturer; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrderStatusRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrderStatusRepository.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrderStatusRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.OrderStatus; +import mk.ukim.finki.db.distributorapp.model.entities.OrderStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Orders; +import mk.ukim.finki.db.distributorapp.model.entities.Orders; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/PriceRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/PriceRepository.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/PriceRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Price; +import mk.ukim.finki.db.distributorapp.model.entities.Price; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaRepository.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.ProForma; +import mk.ukim.finki.db.distributorapp.model.entities.ProForma; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaStatusRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaStatusRepository.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaStatusRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.ProFormaStatus; +import mk.ukim.finki.db.distributorapp.model.entities.ProFormaStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/RegionRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Region; +import mk.ukim.finki.db.distributorapp.model.entities.Region; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/UsersRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Users; +import mk.ukim.finki.db.distributorapp.model.entities.Users; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Vehicle; +import mk.ukim.finki.db.distributorapp.model.entities.Vehicle; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WarehouseRepository.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Warehouse; +import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/ConfirmationToken.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -6,5 +6,5 @@ import lombok.Data; import lombok.NoArgsConstructor; -import mk.ukim.finki.db.distributorapp.model.Users; +import mk.ukim.finki.db.distributorapp.model.entities.Users; import java.util.Date; @@ -15,5 +15,5 @@ @AllArgsConstructor @Entity -@Table(name = "token", schema = "IND0_185022") +@Table(name = "token") public class ConfirmationToken { @Id Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleService.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,7 +1,8 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Article; -import mk.ukim.finki.db.distributorapp.model.Category; -import mk.ukim.finki.db.distributorapp.model.Manufacturer; +import mk.ukim.finki.db.distributorapp.model.dto.ArticleDto; +import mk.ukim.finki.db.distributorapp.model.entities.Article; +import mk.ukim.finki.db.distributorapp.model.entities.Category; +import mk.ukim.finki.db.distributorapp.model.entities.Manufacturer; import java.util.List; @@ -11,4 +12,6 @@ List
getAllArticles(); + + List getAllArticlesDto(); Optional
findById(Long id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleUnitService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleUnitService.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleUnitService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,8 +1,8 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Article; -import mk.ukim.finki.db.distributorapp.model.ArticleUnit; -import mk.ukim.finki.db.distributorapp.model.Orders; -import mk.ukim.finki.db.distributorapp.model.Warehouse; +import mk.ukim.finki.db.distributorapp.model.entities.Article; +import mk.ukim.finki.db.distributorapp.model.entities.ArticleUnit; +import mk.ukim.finki.db.distributorapp.model.entities.Orders; +import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import java.util.Date; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CategoryService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CategoryService.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CategoryService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,6 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Category; +import mk.ukim.finki.db.distributorapp.model.dto.CategoryDto; +import mk.ukim.finki.db.distributorapp.model.entities.Category; import java.util.List; @@ -9,4 +10,6 @@ List listCategories(); + + List listCategoriesDto(); Optional getCategoryById(Long id); 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CityService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.City; -import mk.ukim.finki.db.distributorapp.model.Region; +import mk.ukim.finki.db.distributorapp.model.entities.City; +import mk.ukim.finki.db.distributorapp.model.entities.Region; import java.util.List; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Customer; +import mk.ukim.finki.db.distributorapp.model.entities.Customer; import java.time.LocalTime; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,8 +1,8 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Delivery; -import mk.ukim.finki.db.distributorapp.model.Driver; -import mk.ukim.finki.db.distributorapp.model.Vehicle; -import mk.ukim.finki.db.distributorapp.model.DeliveryStatus; +import mk.ukim.finki.db.distributorapp.model.entities.Delivery; +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.DeliveryStatus; import java.time.LocalDate; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryStatusService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryStatusService.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryStatusService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.DeliveryStatus; +import mk.ukim.finki.db.distributorapp.model.entities.DeliveryStatus; import java.util.List; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Driver; -import mk.ukim.finki.db.distributorapp.model.Vehicle; +import mk.ukim.finki.db.distributorapp.model.entities.Driver; +import mk.ukim.finki.db.distributorapp.model.entities.Vehicle; import java.util.List; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManagerService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Manager; -import mk.ukim.finki.db.distributorapp.model.Warehouse; +import mk.ukim.finki.db.distributorapp.model.entities.Manager; +import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import java.util.List; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManufacturerService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManufacturerService.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManufacturerService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Manufacturer; +import mk.ukim.finki.db.distributorapp.model.entities.Manufacturer; import java.util.List; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrderStatusService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrderStatusService.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrderStatusService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.OrderStatus; +import mk.ukim.finki.db.distributorapp.model.entities.OrderStatus; import java.util.List; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,9 +1,9 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Customer; -import mk.ukim.finki.db.distributorapp.model.Delivery; -import mk.ukim.finki.db.distributorapp.model.Orders; -import mk.ukim.finki.db.distributorapp.model.ProForma; -import mk.ukim.finki.db.distributorapp.model.OrderStatus; +import mk.ukim.finki.db.distributorapp.model.entities.Customer; +import mk.ukim.finki.db.distributorapp.model.entities.Delivery; +import mk.ukim.finki.db.distributorapp.model.entities.Orders; +import mk.ukim.finki.db.distributorapp.model.entities.ProForma; +import mk.ukim.finki.db.distributorapp.model.entities.OrderStatus; import java.time.LocalDate; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/PriceService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/PriceService.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/PriceService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Article; -import mk.ukim.finki.db.distributorapp.model.Price; +import mk.ukim.finki.db.distributorapp.model.entities.Article; +import mk.ukim.finki.db.distributorapp.model.entities.Price; import java.math.BigDecimal; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.ProForma; -import mk.ukim.finki.db.distributorapp.model.ProFormaStatus; +import mk.ukim.finki.db.distributorapp.model.entities.ProForma; +import mk.ukim.finki.db.distributorapp.model.entities.ProFormaStatus; import java.time.LocalDate; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaStatusService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaStatusService.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaStatusService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.ProFormaStatus; +import mk.ukim.finki.db.distributorapp.model.entities.ProFormaStatus; import java.util.List; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/RegionService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Region; +import mk.ukim.finki.db.distributorapp.model.entities.Region; import java.util.List; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/UsersService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.City; -import mk.ukim.finki.db.distributorapp.model.Users; +import mk.ukim.finki.db.distributorapp.model.entities.City; +import mk.ukim.finki.db.distributorapp.model.entities.Users; import org.springframework.http.ResponseEntity; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/VehicleService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.Vehicle; -import mk.ukim.finki.db.distributorapp.model.Warehouse; +import mk.ukim.finki.db.distributorapp.model.entities.Vehicle; +import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import java.time.LocalDate; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WarehouseService.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.City; -import mk.ukim.finki.db.distributorapp.model.Warehouse; +import mk.ukim.finki.db.distributorapp.model.entities.City; +import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import java.util.List; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,7 +1,8 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Article; -import mk.ukim.finki.db.distributorapp.model.Category; -import mk.ukim.finki.db.distributorapp.model.Manufacturer; +import mk.ukim.finki.db.distributorapp.model.dto.ArticleDto; +import mk.ukim.finki.db.distributorapp.model.entities.Article; +import mk.ukim.finki.db.distributorapp.model.entities.Category; +import mk.ukim.finki.db.distributorapp.model.entities.Manufacturer; import mk.ukim.finki.db.distributorapp.repository.ArticleRepository; import mk.ukim.finki.db.distributorapp.service.ArticleService; @@ -22,4 +23,17 @@ public List
getAllArticles() { return this.articleRepository.listAll(); + } + + @Override + public List getAllArticlesDto() { + List
articles = this.articleRepository.listAll(); + return articles.stream().map(art->new ArticleDto( + art.getArticleId(), + art.getArticleName(), + art.getManufacturer().getManufacturerName(), + art.getCategory().getCategoryName(), + art.getArticleWeight(), + art.getArtImage() + )).toList(); } 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleUnitServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,8 +1,8 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Article; -import mk.ukim.finki.db.distributorapp.model.ArticleUnit; -import mk.ukim.finki.db.distributorapp.model.Orders; -import mk.ukim.finki.db.distributorapp.model.Warehouse; +import mk.ukim.finki.db.distributorapp.model.entities.Article; +import mk.ukim.finki.db.distributorapp.model.entities.ArticleUnit; +import mk.ukim.finki.db.distributorapp.model.entities.Orders; +import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import mk.ukim.finki.db.distributorapp.repository.ArticleUnitRepository; import mk.ukim.finki.db.distributorapp.service.ArticleUnitService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CategoryServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,6 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Category; +import mk.ukim.finki.db.distributorapp.model.dto.CategoryDto; +import mk.ukim.finki.db.distributorapp.model.entities.Category; import mk.ukim.finki.db.distributorapp.repository.CategoryRepository; import mk.ukim.finki.db.distributorapp.service.CategoryService; @@ -11,9 +12,9 @@ @Service public class CategoryServiceImpl implements CategoryService { - private final CategoryRepository categoryRepository; public CategoryServiceImpl(CategoryRepository categoryRepository) { this.categoryRepository = categoryRepository; + } @@ -25,4 +26,13 @@ public List listCategories() { return this.categoryRepository.listAll(); + } + + @Override + public List listCategoriesDto() { + List categories = this.categoryRepository.listAll(); + return categories.stream().map(cat->new CategoryDto( + cat.getCategoryId(), + cat.getCategoryName() + )).toList(); } 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CityServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.City; -import mk.ukim.finki.db.distributorapp.model.Region; +import mk.ukim.finki.db.distributorapp.model.entities.City; +import mk.ukim.finki.db.distributorapp.model.entities.Region; import mk.ukim.finki.db.distributorapp.repository.CityRepository; import mk.ukim.finki.db.distributorapp.service.CityService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Customer; +import mk.ukim.finki.db.distributorapp.model.entities.Customer; import mk.ukim.finki.db.distributorapp.repository.CustomerRepository; import mk.ukim.finki.db.distributorapp.service.CustomerService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,8 +1,8 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Delivery; -import mk.ukim.finki.db.distributorapp.model.Driver; -import mk.ukim.finki.db.distributorapp.model.Vehicle; -import mk.ukim.finki.db.distributorapp.model.DeliveryStatus; +import mk.ukim.finki.db.distributorapp.model.entities.Delivery; +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.DeliveryStatus; import mk.ukim.finki.db.distributorapp.repository.DeliveryRepository; import mk.ukim.finki.db.distributorapp.service.DeliveryService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryStatusServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.DeliveryStatus; +import mk.ukim.finki.db.distributorapp.model.entities.DeliveryStatus; import mk.ukim.finki.db.distributorapp.repository.DeliveryStatusRepository; import mk.ukim.finki.db.distributorapp.service.DeliveryStatusService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Driver; -import mk.ukim.finki.db.distributorapp.model.Vehicle; +import mk.ukim.finki.db.distributorapp.model.entities.Driver; +import mk.ukim.finki.db.distributorapp.model.entities.Vehicle; import mk.ukim.finki.db.distributorapp.repository.DriverRepository; import mk.ukim.finki.db.distributorapp.service.DriverService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManagerServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Manager; -import mk.ukim.finki.db.distributorapp.model.Warehouse; +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.ManagerRepository; import mk.ukim.finki.db.distributorapp.service.ManagerService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManufacturerServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Manufacturer; +import mk.ukim.finki.db.distributorapp.model.entities.Manufacturer; import mk.ukim.finki.db.distributorapp.repository.ManufacturerRepository; import mk.ukim.finki.db.distributorapp.service.ManufacturerService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrderStatusServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.OrderStatus; +import mk.ukim.finki.db.distributorapp.model.entities.OrderStatus; import mk.ukim.finki.db.distributorapp.repository.OrderStatusRepository; import mk.ukim.finki.db.distributorapp.service.OrderStatusService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,9 +1,9 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Customer; -import mk.ukim.finki.db.distributorapp.model.Delivery; -import mk.ukim.finki.db.distributorapp.model.Orders; -import mk.ukim.finki.db.distributorapp.model.ProForma; -import mk.ukim.finki.db.distributorapp.model.OrderStatus; +import mk.ukim.finki.db.distributorapp.model.entities.Customer; +import mk.ukim.finki.db.distributorapp.model.entities.Delivery; +import mk.ukim.finki.db.distributorapp.model.entities.Orders; +import mk.ukim.finki.db.distributorapp.model.entities.ProForma; +import mk.ukim.finki.db.distributorapp.model.entities.OrderStatus; import mk.ukim.finki.db.distributorapp.repository.OrdersRepository; import mk.ukim.finki.db.distributorapp.service.OrdersService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/PriceServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Article; -import mk.ukim.finki.db.distributorapp.model.Price; +import mk.ukim.finki.db.distributorapp.model.entities.Article; +import mk.ukim.finki.db.distributorapp.model.entities.Price; import mk.ukim.finki.db.distributorapp.repository.PriceRepository; import mk.ukim.finki.db.distributorapp.service.PriceService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.ProForma; -import mk.ukim.finki.db.distributorapp.model.ProFormaStatus; +import mk.ukim.finki.db.distributorapp.model.entities.ProForma; +import mk.ukim.finki.db.distributorapp.model.entities.ProFormaStatus; import mk.ukim.finki.db.distributorapp.repository.ProFormaRepository; import mk.ukim.finki.db.distributorapp.service.ProFormaService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaStatusServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.ProFormaStatus; +import mk.ukim.finki.db.distributorapp.model.entities.ProFormaStatus; import mk.ukim.finki.db.distributorapp.repository.ProFormaStatusRepository; import mk.ukim.finki.db.distributorapp.service.ProFormaStatusService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/RegionServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Region; +import mk.ukim.finki.db.distributorapp.model.entities.Region; import mk.ukim.finki.db.distributorapp.repository.RegionRepository; import mk.ukim.finki.db.distributorapp.service.RegionService; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/UsersServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.City; -import mk.ukim.finki.db.distributorapp.model.Users; +import mk.ukim.finki.db.distributorapp.model.entities.City; +import mk.ukim.finki.db.distributorapp.model.entities.Users; import mk.ukim.finki.db.distributorapp.model.exceptions.InvalidArgumentsException; import mk.ukim.finki.db.distributorapp.model.exceptions.InvalidUserCredentialsException; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.Vehicle; -import mk.ukim.finki.db.distributorapp.model.Warehouse; +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; 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 a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -1,6 +1,6 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.City; -import mk.ukim.finki.db.distributorapp.model.Warehouse; +import mk.ukim.finki.db.distributorapp.model.entities.City; +import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import mk.ukim.finki.db.distributorapp.repository.WarehouseRepository; import mk.ukim.finki.db.distributorapp.service.WarehouseService; Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,33 @@ +package mk.ukim.finki.db.distributorapp.web; + +import mk.ukim.finki.db.distributorapp.model.dto.ArticleDto; +import mk.ukim.finki.db.distributorapp.model.entities.Article; +import mk.ukim.finki.db.distributorapp.service.ArticleService; +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("/api/article") +public class ArticleController { + private final ArticleService articleService; + + public ArticleController(ArticleService articleService) { + this.articleService = articleService; + } + + @GetMapping("/all") + ResponseEntity> getAllArticles() { + List
articles = articleService.getAllArticles(); + return ResponseEntity.ok(articles); + } + + @GetMapping("/all/dto") + ResponseEntity> getAllArticlesDto() { + List articles = articleService.getAllArticlesDto(); + return ResponseEntity.ok(articles); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleUnitController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleUnitController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleUnitController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,27 @@ +package mk.ukim.finki.db.distributorapp.web; + +import mk.ukim.finki.db.distributorapp.model.entities.ArticleUnit; +import mk.ukim.finki.db.distributorapp.service.ArticleUnitService; +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("/api/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); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CategoryController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CategoryController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CategoryController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,32 @@ +package mk.ukim.finki.db.distributorapp.web; + +import mk.ukim.finki.db.distributorapp.model.dto.CategoryDto; +import mk.ukim.finki.db.distributorapp.model.entities.Category; +import mk.ukim.finki.db.distributorapp.service.CategoryService; +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("/api/category") +public class CategoryController { + private final CategoryService categoryService; + + public CategoryController(CategoryService categoryService) { + this.categoryService = categoryService; + } + + @GetMapping("/all") + public ResponseEntity> getAllCategories() { + return ResponseEntity.ok(this.categoryService.listCategories()); + } + + @GetMapping("/all/dto") + public ResponseEntity> getAllCategoriesDto() { + List categoryDtos = this.categoryService.listCategoriesDto(); + return ResponseEntity.ok(categoryDtos); + } +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,65 @@ +package mk.ukim.finki.db.distributorapp.web; + +import mk.ukim.finki.db.distributorapp.model.entities.Customer; +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("/api/customer") +public class CustomerController { + + private final CustomerService customerService; + + public CustomerController(CustomerService customerService) { + this.customerService = customerService; + } + + @GetMapping("/all") + public ResponseEntity> getAllCustomers() { + List customers = this.customerService.findAllCustomers(); + return ResponseEntity.ok(customers); + } + + @GetMapping("/find/{id}") + public ResponseEntity getCustomer(@PathVariable Long id) { + Customer c = this.customerService.findCustomerById(id).get(); + return ResponseEntity.ok(c); + } + + @PostMapping("/add") + public ResponseEntity createCustomer(@RequestBody Customer customer) { + Customer newCustomer = this.customerService.create( + customer.getUserId(), + customer.getCustomerEDB(), + customer.getCustomerCompanyName(), + customer.getCustomerAddress(), + customer.getCustomerOpenTime(), + customer.getCustomerCloseTime(), + customer.getCustomerRepresentativeImage()).get(); + + return ResponseEntity.ok(newCustomer); + } + + @PutMapping("/edit") + public ResponseEntity updateCustomer(@RequestBody Customer customer) { + Customer updateCustomer = this.customerService.edit( + customer.getUserId(), + customer.getCustomerEDB(), + customer.getCustomerCompanyName(), + customer.getCustomerAddress(), + customer.getCustomerOpenTime(), + customer.getCustomerCloseTime(), + customer.getCustomerRepresentativeImage()).get(); + + return ResponseEntity.ok(updateCustomer); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteCustomer(@PathVariable Long id) { + this.customerService.delete(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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,15 @@ +package mk.ukim.finki.db.distributorapp.web; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/driver") +public class DriverController { + + @GetMapping("/home") + public String driverHome() { + return "userDriver/home"; + } +} 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 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/HomeController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,42 @@ +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 org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +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") +public class HomeController { + + @GetMapping + public String homePage(Model model) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (authentication == null || !authentication.isAuthenticated() || authentication.getPrincipal().equals("anonymousUser")) { + model.addAttribute("userType", "Guest"); + return "home"; + } + + Users user = (Users) authentication.getPrincipal(); + + 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"; + } + model.addAttribute("userType", "Guest"); + return "home"; + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/LoginController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/LoginController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/LoginController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,39 @@ +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/web/ManagerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,15 @@ +package mk.ukim.finki.db.distributorapp.web; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/manager") +public class ManagerController { + + @GetMapping("/home") + public String managerHome() { + return "userManager/home"; + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/RegisterController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/RegisterController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/RegisterController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,55 @@ +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.getCityById(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/web/UsersController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/UsersController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/UsersController.java (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -0,0 +1,38 @@ +package mk.ukim.finki.db.distributorapp.web; + +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.*; + +import java.util.List; + +@RestController() +@RequestMapping("/api/users") +public class UsersController { + + private final UsersService usersService; + + public UsersController(UsersService usersService) { + this.usersService = usersService; + } + + @GetMapping("/all") + public ResponseEntity> getAllUsers() { + List users = this.usersService.findAllUsers(); + return ResponseEntity.ok(users); + } + + @GetMapping("/find/{email}") + public ResponseEntity findUserByEmail(@PathVariable("email") String email) { + Users user = this.usersService.getUserByEmail(email).get(); + return ResponseEntity.ok(user); + } + + @PostMapping("/add") + public ResponseEntity addUser(@RequestBody Users user) { + return ResponseEntity.ok(user); + } + + +} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/CustomerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/CustomerController.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,65 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.controller; - -import mk.ukim.finki.db.distributorapp.model.Customer; -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("/api/customer") -public class CustomerController { - - private final CustomerService customerService; - - public CustomerController(CustomerService customerService) { - this.customerService = customerService; - } - - @GetMapping("/all") - public ResponseEntity> getAllCustomers() { - List customers = this.customerService.findAllCustomers(); - return ResponseEntity.ok(customers); - } - - @GetMapping("/find/{id}") - public ResponseEntity getCustomer(@PathVariable Long id) { - Customer c = this.customerService.findCustomerById(id).get(); - return ResponseEntity.ok(c); - } - - @PostMapping("/add") - public ResponseEntity createCustomer(@RequestBody Customer customer) { - Customer newCustomer = this.customerService.create( - customer.getUserId(), - customer.getCustomerEDB(), - customer.getCustomerCompanyName(), - customer.getCustomerAddress(), - customer.getCustomerOpenTime(), - customer.getCustomerCloseTime(), - customer.getCustomerRepresentativeImage()).get(); - - return ResponseEntity.ok(newCustomer); - } - - @PutMapping("/edit") - public ResponseEntity updateCustomer(@RequestBody Customer customer) { - Customer updateCustomer = this.customerService.edit( - customer.getUserId(), - customer.getCustomerEDB(), - customer.getCustomerCompanyName(), - customer.getCustomerAddress(), - customer.getCustomerOpenTime(), - customer.getCustomerCloseTime(), - customer.getCustomerRepresentativeImage()).get(); - - return ResponseEntity.ok(updateCustomer); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteCustomer(@PathVariable Long id) { - this.customerService.delete(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/DriverController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/DriverController.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,15 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/api/driver") -public class DriverController { - - @GetMapping("/home") - public String driverHome() { - return "userDriver/home"; - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/HomeController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/HomeController.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.controller; - -import mk.ukim.finki.db.distributorapp.model.Customer; -import mk.ukim.finki.db.distributorapp.model.Driver; -import mk.ukim.finki.db.distributorapp.model.Manager; -import mk.ukim.finki.db.distributorapp.model.Users; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -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") -public class HomeController { - - @GetMapping - public String homePage(Model model) { - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - - if (authentication == null || !authentication.isAuthenticated() || authentication.getPrincipal().equals("anonymousUser")) { - model.addAttribute("userType", "Guest"); - return "home"; - } - - Users user = (Users) authentication.getPrincipal(); - - 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"; - } - model.addAttribute("userType", "Guest"); - return "home"; - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/LoginController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/LoginController.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,39 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.controller; - -import jakarta.servlet.http.HttpServletRequest; -import mk.ukim.finki.db.distributorapp.model.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: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/ManagerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/ManagerController.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,15 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.controller; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -@Controller -@RequestMapping("/manager") -public class ManagerController { - - @GetMapping("/home") - public String managerHome() { - return "userManager/home"; - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/RegisterController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/RegisterController.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,55 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.controller; - -import mk.ukim.finki.db.distributorapp.model.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.getCityById(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: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/UsersController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/UsersController.java (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ (revision ) @@ -1,38 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.controller; - -import mk.ukim.finki.db.distributorapp.model.Users; -import mk.ukim.finki.db.distributorapp.service.UsersService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController() -@RequestMapping("/api/users") -public class UsersController { - - private final UsersService usersService; - - public UsersController(UsersService usersService) { - this.usersService = usersService; - } - - @GetMapping("/all") - public ResponseEntity> getAllUsers() { - List users = this.usersService.findAllUsers(); - return ResponseEntity.ok(users); - } - - @GetMapping("/find/{email}") - public ResponseEntity findUserByEmail(@PathVariable("email") String email) { - Users user = this.usersService.getUserByEmail(email).get(); - return ResponseEntity.ok(user); - } - - @PostMapping("/add") - public ResponseEntity addUser(@RequestBody Users user) { - return ResponseEntity.ok(user); - } - - -} Index: backend/src/main/resources/application.properties =================================================================== --- backend/src/main/resources/application.properties (revision a7e0bad885ca2bbe8cfd6ae927e16d56cccae7f6) +++ backend/src/main/resources/application.properties (revision 5a2ffe144a22d230603a171dcafac0c5c5233ee5) @@ -10,9 +10,12 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true -##spring.jpa.hibernate.ddl-auto=validate +#spring.jpa.hibernate.ddl-auto=validate spring.jpa.show-sql=true spring.datasource.hikari.schema=IND0_185022 +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +spring.jpa.properties.hibernate.format_sql=true +spring.jpa.properties.hibernate.use_sql_comments=true #spring.datasource.driver-class-name=org.postgresql.Driver #spring.data.jdbc.dialect=postgresql @@ -27,4 +30,4 @@ ## Logging/Debugging: -#logging.level.org.hibernate.SQL=DEBUG -#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE +logging.level.org.springframework.jdbc=DEBUG +logging.level.org.hibernate.SQL=DEBUG