Index: src/main/java/mk/ukim/finki/db/distributorapp/config/CustomUserDetailsService.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/config/CustomUserDetailsService.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/config/CustomUserDetailsService.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -29,5 +29,5 @@ public boolean authenticateUser(String providedPassword, Users user) { - return passwordEncoder.matchesWithSalt(providedPassword, user.getPassword(), user.getUser_salt()); + return passwordEncoder.matchesWithSalt(providedPassword, user.getPassword(), user.getUserSalt()); } } Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Article.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Article.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/Article.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -13,12 +13,12 @@ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "art_id") - private Long article_id; + @Column(name = "art_id", nullable = false) + private Long articleId; @Column(name = "art_name", nullable = false) - private String article_name; + private String articleName; @Column(name = "art_weight", nullable = false) - private Integer article_weight; + private Integer articleWeight; @ManyToOne @@ -34,4 +34,4 @@ @OneToMany(mappedBy = "article") - private List articleUnits; + private List articleUnits; } Index: src/main/java/mk/ukim/finki/db/distributorapp/model/ArticleUnit.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/ArticleUnit.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/ArticleUnit.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -0,0 +1,42 @@ +package mk.ukim.finki.db.distributorapp.model; + +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) + private Long unitId; + + @Column(name = "unit_expiration_date", nullable = false) + private Date unitExpirationDate; + + @Column(name = "unit_serial_number", nullable = false) + private String unitSerialNumber; + + @Column(name = "unit_batch_number", nullable = false) + private String unitBatchNumber; + + @Column(name = "unit_manufacture_date", nullable = false) + private Date unitManufactureDate; + + @Column(name = "unit_cost_price", nullable = false) + 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: c/main/java/mk/ukim/finki/db/distributorapp/model/Article_Unit.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Article_Unit.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import jakarta.persistence.*; -import lombok.Data; - -import java.util.Date; - -@Entity -@Data -@Table(name = "article_unit", schema = "IND0_185022") -public class Article_Unit { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long unit_id; - - @Column(name = "unit_expiration_date", nullable = false) - private Date unit_expiration_date; - - @Column(name = "unit_serial_number", nullable = false) - private String unit_serial_number; - - @Column(name = "unit_batch_number", nullable = false) - private String unit_batch_number; - - @Column(name = "unit_manufacture_date", nullable = false) - private Date unit_manufacture_date; - - @Column(name = "unit_cost_price", nullable = false) - private Double unit_cost_price; - - @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: src/main/java/mk/ukim/finki/db/distributorapp/model/Category.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Category.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/Category.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -13,8 +13,8 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ctg_id") - private Long category_id; + private Long categoryId; @Column(name = "ctg_name", nullable = false) - private String category_name; + private String categoryName; @OneToMany(mappedBy = "category") Index: src/main/java/mk/ukim/finki/db/distributorapp/model/City.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/City.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/City.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -13,8 +13,8 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "city_id") - private Long city_id; + private Long cityId; @Column(name = "city_name", nullable = false) - private String city_name; + private String cityName; @OneToMany(mappedBy = "city") Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Customer.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Customer.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/Customer.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -17,20 +17,20 @@ public class Customer extends Users { @Column(name = "cust_EDB", nullable = false, length = 13) - private String customer_EDB; + private String customerEDB; @Column(name = "cust_company_name", nullable = false) - private String customer_company_name; + private String customerCompanyName; @Column(name = "cust_address", nullable = false) - private String address; + private String customerAddress; @Column(name = "cust_open_time", nullable = false) - private LocalTime customer_open_time; + private LocalTime customerOpenTime; @Column(name = "cust_close_time", nullable = false) - private LocalTime customer_close_time; + private LocalTime customerCloseTime; @Column(name = "cust_representative_img", nullable = false) - private String customer_representative_image; + private String customerRepresentativeImage; @OneToMany(mappedBy = "customer") Index: src/main/java/mk/ukim/finki/db/distributorapp/model/CustomerWeekday.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/CustomerWeekday.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/CustomerWeekday.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -15,9 +15,9 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "cust_day_id", nullable = false) - private Long id; + private Long customerDayId; @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "cust_id", nullable = false) - private Customer cust; + private Customer customer; @ManyToOne(fetch = FetchType.LAZY, optional = false) @@ -26,8 +26,8 @@ @Column(name = "start_time", nullable = false) - private LocalTime startTime; + private LocalTime customerDayStartTime; @Column(name = "end_time", nullable = false) - private LocalTime endTime; + private LocalTime customerDayEndTime; } Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -16,27 +16,27 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "del_id") - private Long delivery_id; + private Long deliveryId; @Column(name = "del_date_created", nullable = false) - private LocalDate delivery_date_created; + private LocalDate deliveryDateCreated; @Column(name = "del_date", nullable = false) - private LocalDate delivery_date; + private LocalDate deliveryDate; @Column(name = "del_start_km") - private Integer delivery_start_km; + private Integer deliveryStartKm; @Column(name = "del_end_km") - private Integer delivery_end_km; + private Integer deliveryEndKm; @Column(name = "del_start_time") - private LocalTime delivery_start_time; + private LocalTime deliveryStartTime; @Column(name = "del_end_time") - private LocalTime delivery_end_time; + private LocalTime deliveryEndTime; @ManyToOne @JoinColumn(name = "del_status_id", nullable = false) - private Delivery_Status delivery_status; + private Delivery_Status deliveryStatus; @ManyToOne Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Manufacturer.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Manufacturer.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/Manufacturer.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -13,17 +13,17 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "man_id") - private Long manufacturer_id; + private Long manufacturerId; @Column(name = "man_name", nullable = false) - private String manufacturer_name; + private String manufacturerName; @Column(name = "man_address", nullable = false) - private String manufacturer_address; + private String manufacturerAddress; @Column(name = "man_mobile", nullable = false) - private String manufacturer_mobile; + private String manufacturerMobile; @Column(name = "man_email", nullable = false) - private String manufacturer_email; + private String manufacturerEmail; @OneToMany(mappedBy = "manufacturer") Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -16,21 +16,21 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ord_id", nullable = false) - private Long order_id; + private Long orderId; @Column(name = "ord_date", nullable = false) - private LocalDate order_date; + private LocalDate orderDate; @Column(name = "ord_sum", nullable = false) - private Integer order_sum; + private Integer orderSum; @Column(name = "ord_fulfillment_date") - private LocalDateTime order_fulfillment_date; + private LocalDateTime orderFulfillmentDate; @Column(name = "ord_comment") - private String order_comment; + private String orderComment; @ManyToOne @JoinColumn(name = "ord_status_id") - private Order_Status order_status; + private Order_Status orderStatus; @ManyToOne @@ -44,7 +44,7 @@ @OneToOne @JoinColumn(name = "pf_id", nullable = false, unique = true) - private Pro_Forma proForma; + private ProForma proForma; @OneToMany(mappedBy = "order") - private List articleUnits; + private List articleUnits; } Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Price.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Price.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/Price.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -14,5 +14,5 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "price_id") - private Integer price_id; + private Integer priceId; @Column(name = "price", nullable = false) @@ -20,5 +20,5 @@ @Column(name = "price_eff_date", nullable = false) - private LocalDateTime price_effective_date; + private LocalDateTime priceEffectiveDate; @ManyToOne Index: src/main/java/mk/ukim/finki/db/distributorapp/model/ProForma.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/ProForma.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/ProForma.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -0,0 +1,30 @@ +package mk.ukim.finki.db.distributorapp.model; + +import jakarta.persistence.*; +import lombok.Data; +import mk.ukim.finki.db.distributorapp.model.statuses.Pro_Forma_Status; + +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") + private Long proFormaId; + + @Column(name = "pf_deadline", nullable = false) + private LocalDate proFormaDeadline; + + @Column(name = "pf_date_created", nullable = false) + private LocalDate proFormaDateCreated; + + @ManyToOne + @JoinColumn(name = "pf_status_id", nullable = false) + private Pro_Forma_Status proFormaStatus; + + @OneToOne(mappedBy = "proForma") + private Orders order; +} Index: c/main/java/mk/ukim/finki/db/distributorapp/model/Pro_Forma.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Pro_Forma.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ (revision ) @@ -1,30 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model; - -import jakarta.persistence.*; -import lombok.Data; -import mk.ukim.finki.db.distributorapp.model.statuses.Pro_Forma_Status; - -import java.time.LocalDate; - -@Entity -@Data -@Table(name = "pro_forma", schema = "IND0_185022") -public class Pro_Forma { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "pf_id") - private Long pro_forma_id; - - @Column(name = "pf_deadline", nullable = false) - private LocalDate pro_forma_deadline; - - @Column(name = "pf_date_created", nullable = false) - private LocalDate pro_forma_date_created; - - @ManyToOne - @JoinColumn(name = "pf_status_id", nullable = false) - private Pro_Forma_Status pro_forma_status; - - @OneToOne(mappedBy = "proForma") - private Orders order; -} Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Users.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Users.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/Users.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -21,29 +21,29 @@ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long user_id; + private Long userId; @Column(name = "user_name", nullable = false) - private String user_name; + private String userName; @Column(name = "user_surname", nullable = false) - private String user_surname; + private String userSurname; @Column(name = "user_pass", nullable = false) - private String user_password; + private String userPassword; @Column(name = "user_email", nullable = false) - private String user_email; + private String userEmail; @Column(name = "user_mobile", nullable = false) - private String user_mobile; + private String userMobile; @Column(name = "user_salt", nullable = false) - private String user_salt; + private String userSalt; @Column(name = "user_email_conf", nullable = false) - private Boolean user_active; + private Boolean userActive; @Column(name = "user_image") - private String user_image; + private String userImage; @ManyToOne @@ -53,10 +53,10 @@ @Override public String getUsername() { - return user_email; + return userEmail; } @Override public String getPassword() { - return user_password; + return userPassword; } @@ -83,5 +83,5 @@ @Override public boolean isEnabled() { - return user_active; + return userActive; } } Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Vehicle.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Vehicle.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/Vehicle.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -14,29 +14,29 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "veh_id") - private Integer vehicle_id; + private Integer vehicleId; @Column(name = "veh_carry_weight", nullable = false) - private Integer vehicle_carry_weight; + private Integer vehicleCarryWeight; @Column(name = "veh_service_interval", nullable = false) - private Short vehicle_service_interval; + private Short vehicleServiceInterval; @Column(name = "veh_kilometers", nullable = false) - private Integer vehicle_kilometers; + private Integer vehicleKilometers; @Column(name = "veh_last_service") - private LocalDate vehicle_last_service; + private LocalDate vehicleLastService; @Column(name = "veh_last_service_km") - private Integer vehicle_last_service_km; + private Integer vehicleLastServiceKm; @Column(name = "veh_plate", nullable = false, length = 8) - private String vehicle_plate; + private String vehiclePlate; @Column(name = "veh_vin", nullable = false, length = 17) - private String vehicle_vin; + private String vehicleVin; @Column(name = "veh_reg", nullable = false) - private LocalDate vehicle_registration_date; + private LocalDate vehicleRegDate; @ManyToOne Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Warehouse.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/Warehouse.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/Warehouse.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -13,8 +13,8 @@ @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "wh_id") - private Integer warehouse_id; + private Integer warehouseId; @Column(name = "wh_address", nullable = false) - private String warehouse_address; + private String warehouseAddress; @ManyToOne @@ -29,4 +29,4 @@ @OneToMany(mappedBy = "warehouse") - private List articleUnits; + private List articleUnits; } Index: src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Delivery_Status.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Delivery_Status.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Delivery_Status.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -21,5 +21,5 @@ private String delivery_status_description; - @OneToMany(mappedBy = "delivery_status") + @OneToMany(mappedBy = "deliveryStatus") private List deliveries; } Index: src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Order_Status.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Order_Status.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Order_Status.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -21,5 +21,5 @@ private String order_status_description; - @OneToMany(mappedBy = "order_status") + @OneToMany(mappedBy = "orderStatus") private List orders; } Index: src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Pro_Forma_Status.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Pro_Forma_Status.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Pro_Forma_Status.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -3,5 +3,5 @@ import jakarta.persistence.*; import lombok.Data; -import mk.ukim.finki.db.distributorapp.model.Pro_Forma; +import mk.ukim.finki.db.distributorapp.model.ProForma; import java.util.List; @@ -21,5 +21,5 @@ private String pro_forma_status_description; - @OneToMany(mappedBy = "pro_forma_status") - private List pro_formas; + @OneToMany(mappedBy = "proFormaStatus") + private List pro_formas; } Index: src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleUnitRepository.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleUnitRepository.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleUnitRepository.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Article_Unit; +import mk.ukim.finki.db.distributorapp.model.ArticleUnit; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -13,5 +13,5 @@ import java.util.Optional; -public interface ArticleUnitRepository extends JpaRepository { +public interface ArticleUnitRepository extends JpaRepository { @Query( nativeQuery = true, @@ -19,5 +19,5 @@ "" ) - List listAll(); + List listAll(); @Query( @@ -26,5 +26,5 @@ "" ) - List findAllByName(@NonNull @Param("name") String name); + List findAllByName(@NonNull @Param("name") String name); @Query( @@ -33,5 +33,5 @@ "" ) - Optional findById(@NonNull @Param("id") Long id); + Optional findById(@NonNull @Param("id") Long id); @Query( @@ -40,5 +40,5 @@ "" ) - List findAllByWarehouse(Integer wh_id); + List findAllByWarehouse(Integer wh_id); @Modifying @@ -49,5 +49,5 @@ "" ) - Optional create( + Optional create( Date unit_exp_date, String unit_ser_number, @@ -67,5 +67,5 @@ "" ) - Optional edit( + Optional edit( Long id, Date unit_exp_date, Index: src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaRepository.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaRepository.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaRepository.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.Pro_Forma; +import mk.ukim.finki.db.distributorapp.model.ProForma; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -13,10 +13,10 @@ import java.util.Optional; -public interface ProFormaRepository extends JpaRepository { +public interface ProFormaRepository extends JpaRepository { @Query( nativeQuery = true, value = "" ) - List listAll(); + List listAll(); @Query( @@ -24,5 +24,5 @@ value = "" ) - Optional findById(@NonNull @Param("id") Short id); + Optional findById(@NonNull @Param("id") Short id); @Modifying @@ -32,5 +32,5 @@ value = "" ) - Optional create(LocalDate pf_deadline, LocalDate pf_create_date, Short pf_status_id, Long order_id); + Optional create(LocalDate pf_deadline, LocalDate pf_create_date, Short pf_status_id, Long order_id); @Modifying @@ -40,5 +40,5 @@ value = "" ) - Optional edit(Long pf_id, LocalDate pf_deadline, LocalDate pf_create_date, Short pf_status_id, Long order_id); + Optional edit(Long pf_id, LocalDate pf_deadline, LocalDate pf_create_date, Short pf_status_id, Long order_id); @Modifying Index: src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleUnitService.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleUnitService.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleUnitService.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -2,5 +2,5 @@ import mk.ukim.finki.db.distributorapp.model.Article; -import mk.ukim.finki.db.distributorapp.model.Article_Unit; +import mk.ukim.finki.db.distributorapp.model.ArticleUnit; import mk.ukim.finki.db.distributorapp.model.Orders; import mk.ukim.finki.db.distributorapp.model.Warehouse; @@ -11,13 +11,13 @@ public interface ArticleUnitService { - List getAllArticleUnits(); + List getAllArticleUnits(); - List findALlByName(String name); + List findALlByName(String name); - List findAllByWarehouse(Warehouse warehouse); + List findAllByWarehouse(Warehouse warehouse); - Optional findById(Long id); + Optional findById(Long id); - Optional create( + Optional create( Date unit_exp_date, String unit_ser_number, @@ -30,5 +30,5 @@ ); - Optional edit( + Optional edit( Long id, Date unit_exp_date, Index: src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -4,5 +4,5 @@ import mk.ukim.finki.db.distributorapp.model.Delivery; import mk.ukim.finki.db.distributorapp.model.Orders; -import mk.ukim.finki.db.distributorapp.model.Pro_Forma; +import mk.ukim.finki.db.distributorapp.model.ProForma; import mk.ukim.finki.db.distributorapp.model.statuses.Order_Status; @@ -27,5 +27,5 @@ Customer customer, Delivery delivery, - Pro_Forma proForma + ProForma proForma ); @@ -39,5 +39,5 @@ Customer customer, Delivery delivery, - Pro_Forma proForma + ProForma proForma ); Index: src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -2,5 +2,5 @@ import mk.ukim.finki.db.distributorapp.model.Orders; -import mk.ukim.finki.db.distributorapp.model.Pro_Forma; +import mk.ukim.finki.db.distributorapp.model.ProForma; import mk.ukim.finki.db.distributorapp.model.statuses.Pro_Forma_Status; @@ -10,11 +10,11 @@ public interface ProFormaService { - List getAllPro_Forma(); + List getAllPro_Forma(); - Optional findProFormaById(Long id); + Optional findProFormaById(Long id); - Optional create(LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order); + Optional create(LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order); - Optional edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order); + Optional edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order); void delete(Long id); Index: src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleServiceImpl.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleServiceImpl.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -42,8 +42,8 @@ public Optional
editById(Article article) { return this.articleRepository.edit( - article.getArticle_id(), article.getArticle_name(), - article.getArticle_weight(), - article.getCategory().getCategory_id(), - article.getManufacturer().getManufacturer_id()); + article.getArticleId(), article.getArticleName(), + article.getArticleWeight(), + article.getCategory().getCategoryId(), + article.getManufacturer().getManufacturerId()); } @@ -53,6 +53,6 @@ name, weight, - category.getCategory_id(), - manufacturer.getManufacturer_id()); + category.getCategoryId(), + manufacturer.getManufacturerId()); } } Index: src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleUnitServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleUnitServiceImpl.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleUnitServiceImpl.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -2,5 +2,5 @@ import mk.ukim.finki.db.distributorapp.model.Article; -import mk.ukim.finki.db.distributorapp.model.Article_Unit; +import mk.ukim.finki.db.distributorapp.model.ArticleUnit; import mk.ukim.finki.db.distributorapp.model.Orders; import mk.ukim.finki.db.distributorapp.model.Warehouse; @@ -22,25 +22,25 @@ @Override - public List getAllArticleUnits() { + public List getAllArticleUnits() { return this.articleUnitRepository.listAll(); } @Override - public List findALlByName(String name) { + public List findALlByName(String name) { return this.articleUnitRepository.findAllByName(name); } @Override - public List findAllByWarehouse(Warehouse warehouse) { - return this.articleUnitRepository.findAllByWarehouse(warehouse.getWarehouse_id()); + public List findAllByWarehouse(Warehouse warehouse) { + return this.articleUnitRepository.findAllByWarehouse(warehouse.getWarehouseId()); } @Override - public Optional findById(Long id) { + public Optional findById(Long id) { return this.articleUnitRepository.findById(id); } @Override - public Optional create(Date unit_exp_date, String unit_ser_number, String unit_batch_number, Date unit_manufacture_date, Double unit_cost_price, Article article, Warehouse warehouse, Orders order) { + public Optional create(Date unit_exp_date, String unit_ser_number, String unit_batch_number, Date unit_manufacture_date, Double unit_cost_price, Article article, Warehouse warehouse, Orders order) { return this.articleUnitRepository.create( unit_exp_date, @@ -49,12 +49,12 @@ unit_manufacture_date, unit_cost_price, - article.getArticle_id(), - warehouse.getWarehouse_id(), - order.getOrder_id() + article.getArticleId(), + warehouse.getWarehouseId(), + order.getOrderId() ); } @Override - public Optional edit(Long id, Date unit_exp_date, String unit_ser_number, String unit_batch_number, Date unit_manufacture_date, Double unit_cost_price, Article article, Warehouse warehouse, Orders order) { + public Optional edit(Long id, Date unit_exp_date, String unit_ser_number, String unit_batch_number, Date unit_manufacture_date, Double unit_cost_price, Article article, Warehouse warehouse, Orders order) { return this.articleUnitRepository.edit( id, @@ -64,7 +64,7 @@ unit_manufacture_date, unit_cost_price, - article.getArticle_id(), - warehouse.getWarehouse_id(), - order.getOrder_id() + article.getArticleId(), + warehouse.getWarehouseId(), + order.getOrderId() ); } Index: src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -29,10 +29,10 @@ @Override public List getAllDeliveriesByVehicleId(Vehicle vehicle) { - return this.deliveryRepository.findAllByVehicle(vehicle.getVehicle_id()); + return this.deliveryRepository.findAllByVehicle(vehicle.getVehicleId()); } @Override public List getAllDeliveriesByDriver(Driver driver) { - return this.deliveryRepository.findDeliveriesByDriver(driver.getUser_id()); + return this.deliveryRepository.findDeliveriesByDriver(driver.getUserId()); } @@ -52,5 +52,5 @@ del_end_time, del_status.getDelivery_status_id(), - vehicle.getVehicle_id() + vehicle.getVehicleId() ); } @@ -67,5 +67,5 @@ del_end_time, del_status.getDelivery_status_id(), - vehicle.getVehicle_id() + vehicle.getVehicleId() ); } Index: src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -35,10 +35,10 @@ @Override public Optional create(Long id, Vehicle vehicle) { - return this.driverRepository.create(id, vehicle.getVehicle_id()); + return this.driverRepository.create(id, vehicle.getVehicleId()); } @Override public Optional edit(Long id, Vehicle vehicle) { - return this.driverRepository.edit(id, vehicle.getVehicle_id()); + return this.driverRepository.edit(id, vehicle.getVehicleId()); } Index: src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManagerServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManagerServiceImpl.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManagerServiceImpl.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -30,10 +30,10 @@ @Override public Optional createManager(Long id, Warehouse warehouse) { - return this.managerRepository.create(id, warehouse.getWarehouse_id()); + return this.managerRepository.create(id, warehouse.getWarehouseId()); } @Override public Optional updateManager(Manager manager, Warehouse warehouse) { - return this.managerRepository.edit(manager.getUser_id(), warehouse.getWarehouse_id()); + return this.managerRepository.edit(manager.getUserId(), warehouse.getWarehouseId()); } Index: src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -4,5 +4,5 @@ import mk.ukim.finki.db.distributorapp.model.Delivery; import mk.ukim.finki.db.distributorapp.model.Orders; -import mk.ukim.finki.db.distributorapp.model.Pro_Forma; +import mk.ukim.finki.db.distributorapp.model.ProForma; import mk.ukim.finki.db.distributorapp.model.statuses.Order_Status; import mk.ukim.finki.db.distributorapp.repository.OrdersRepository; @@ -30,5 +30,5 @@ @Override public List findOrdersByCustomer(Customer customer) { - return this.ordersRepository.findByCustomer(customer.getUser_id()); + return this.ordersRepository.findByCustomer(customer.getUserId()); } @@ -39,5 +39,5 @@ @Override - public Optional create(LocalDate ord_date, Integer ord_sum, LocalDateTime ord_fulfillment_date, String ord_comment, Order_Status ord_status, Customer customer, Delivery delivery, Pro_Forma proForma) { + public Optional create(LocalDate ord_date, Integer ord_sum, LocalDateTime ord_fulfillment_date, String ord_comment, Order_Status ord_status, Customer customer, Delivery delivery, ProForma proForma) { return this.ordersRepository.create( ord_date, @@ -46,12 +46,12 @@ ord_comment, ord_status.getOrder_status_id(), - customer.getUser_id(), - delivery.getDelivery_id(), - proForma.getPro_forma_id() + customer.getUserId(), + delivery.getDeliveryId(), + proForma.getProFormaId() ); } @Override - public Optional edit(Long id, LocalDate ord_date, Integer ord_sum, LocalDateTime ord_fulfillment_date, String ord_comment, Order_Status ord_status, Customer customer, Delivery delivery, Pro_Forma proForma) { + public Optional edit(Long id, LocalDate ord_date, Integer ord_sum, LocalDateTime ord_fulfillment_date, String ord_comment, Order_Status ord_status, Customer customer, Delivery delivery, ProForma proForma) { return this.ordersRepository.edit( id, @@ -61,7 +61,7 @@ ord_comment, ord_status.getOrder_status_id(), - customer.getUser_id(), - delivery.getDelivery_id(), - proForma.getPro_forma_id() + customer.getUserId(), + delivery.getDeliveryId(), + proForma.getProFormaId() ); } Index: src/main/java/mk/ukim/finki/db/distributorapp/service/impl/PriceServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/impl/PriceServiceImpl.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/impl/PriceServiceImpl.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -27,10 +27,10 @@ @Override public List findAllPricesByArticleId(Article article) { - return this.priceRepository.findAllByArticleId(article.getArticle_id()); + return this.priceRepository.findAllByArticleId(article.getArticleId()); } @Override public Optional create(BigDecimal price, LocalDateTime price_eff_date, Article article) { - return this.priceRepository.create(price, price_eff_date, article.getArticle_id()); + return this.priceRepository.create(price, price_eff_date, article.getArticleId()); } @@ -41,5 +41,5 @@ price, price_eff_date, - article.getArticle_id()); + article.getArticleId()); } Index: src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -2,5 +2,5 @@ import mk.ukim.finki.db.distributorapp.model.Orders; -import mk.ukim.finki.db.distributorapp.model.Pro_Forma; +import mk.ukim.finki.db.distributorapp.model.ProForma; import mk.ukim.finki.db.distributorapp.model.statuses.Pro_Forma_Status; import mk.ukim.finki.db.distributorapp.repository.ProFormaRepository; @@ -21,25 +21,25 @@ @Override - public List getAllPro_Forma() { + public List getAllPro_Forma() { return this.proFormaRepository.listAll(); } @Override - public Optional findProFormaById(Long id) { + public Optional findProFormaById(Long id) { return this.proFormaRepository.findById(id); } @Override - public Optional create(LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order) { + public Optional create(LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order) { return this.proFormaRepository.create( pf_deadline, pf_create_date, pf_status.getPro_forma_status_id(), - order.getOrder_id() + order.getOrderId() ); } @Override - public Optional edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order) { + public Optional edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order) { return this.proFormaRepository.edit( id, @@ -47,5 +47,5 @@ pf_create_date, pf_status.getPro_forma_status_id(), - order.getOrder_id() + order.getOrderId() ); } Index: src/main/java/mk/ukim/finki/db/distributorapp/service/impl/UsersServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/impl/UsersServiceImpl.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/impl/UsersServiceImpl.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -35,5 +35,5 @@ @Override public String getUserSalt(String username) { - return usersRepository.findUserByUserName(username).get().getUser_salt(); + return usersRepository.findUserByUserName(username).get().getUserSalt(); } @@ -49,5 +49,5 @@ } - String secPassword = passwordEncoder.encodeWithSalt(password, usersRepository.findUserByUserName(username).get().getUser_salt()); + String secPassword = passwordEncoder.encodeWithSalt(password, usersRepository.findUserByUserName(username).get().getUserSalt()); return usersRepository.findUserByUserNameAndUserPassword(username, secPassword).orElseThrow(InvalidUserCredentialsException::new); @@ -59,5 +59,5 @@ String safePass = passwordEncoder.encodeWithSalt(password, saltValue); - this.usersRepository.create(name, surname, safePass, email, mobile, saltValue, false, image, city.getCity_id()); + this.usersRepository.create(name, surname, safePass, email, mobile, saltValue, false, image, city.getCityId()); Users user = this.usersRepository.findUserByUserEmailIgnoreCase(email).orElseThrow(InvalidUserCredentialsException::new); @@ -81,5 +81,5 @@ if (token != null) { - Users user = this.usersRepository.findUserByUserEmailIgnoreCase(token.getUser().getUser_email()).get(); + Users user = this.usersRepository.findUserByUserEmailIgnoreCase(token.getUser().getUserEmail()).get(); // this.usersRepository.edit(user); return ResponseEntity.ok("Email verified successfully!"); Index: src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -27,5 +27,5 @@ @Override public List getVehiclesByWarehouse(Warehouse warehouse) { - return this.vehicleRepository.findAllByWarehouse(warehouse.getWarehouse_id()); + return this.vehicleRepository.findAllByWarehouse(warehouse.getWarehouseId()); } @@ -36,5 +36,5 @@ return this.vehicleRepository.create(vehicleCarryWeight, vehicleServiceInterval, vehicleKilometers, vehicleLastService, - vehicleLastServiceKm, vehiclePlate, vehicleVIN, vehicleRegDate, warehouse.getWarehouse_id(), driver.getUser_id()); + vehicleLastServiceKm, vehiclePlate, vehicleVIN, vehicleRegDate, warehouse.getWarehouseId(), driver.getUserId()); } @@ -46,5 +46,5 @@ return this.vehicleRepository.edit(id, vehicleCarryWeight, vehicleServiceInterval, vehicleKilometers, vehicleLastService, vehicleLastServiceKm, - vehiclePlate, vehicleVIN, vehicleRegDate, warehouse.getWarehouse_id(), driver.getUser_id()); + vehiclePlate, vehicleVIN, vehicleRegDate, warehouse.getWarehouseId(), driver.getUserId()); } Index: src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java (revision fe846f82ffb0d90a6d7b75331280e19cad56a34b) +++ src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java (revision 5a4b0144b5c65e77392f65bd78bbe2a987583b08) @@ -25,5 +25,5 @@ @Override public List findAllByCity(City city) { - return this.warehouseRepository.findAllByCity(city.getCity_id()); + return this.warehouseRepository.findAllByCity(city.getCityId()); } @@ -35,10 +35,10 @@ @Override public Optional create(String whAddress, City city) { - return this.warehouseRepository.create(whAddress, city.getCity_id()); + return this.warehouseRepository.create(whAddress, city.getCityId()); } @Override public Optional edit(Long id, String whAddress, City city) { - return this.warehouseRepository.edit(id, whAddress, city.getCity_id()); + return this.warehouseRepository.edit(id, whAddress, city.getCityId()); }