Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Article.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Article.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Article.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -2,4 +2,5 @@
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
@@ -14,11 +15,18 @@
     @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
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ArticleUnit.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ArticleUnit.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ArticleUnit.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
@@ -12,19 +13,25 @@
     @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;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Category.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Category.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Category.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
@@ -13,7 +14,9 @@
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "ctg_id")
+    @JsonProperty("categoryId")
     private Long categoryId;
 
     @Column(name = "ctg_name", nullable = false)
+    @JsonProperty("categoryName")
     private String categoryName;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/City.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/City.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/City.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
@@ -13,7 +14,9 @@
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "city_id")
+  @JsonProperty("cityId")
   private Long cityId;
 
   @Column(name = "city_name", nullable = false)
+  @JsonProperty("cityName")
   private String cityName;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Customer.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Customer.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Customer.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -17,19 +18,25 @@
 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;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/CustomerWeekday.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/CustomerWeekday.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/CustomerWeekday.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Getter;
@@ -15,4 +16,5 @@
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "cust_day_id", nullable = false)
+    @JsonProperty("customerDayId")
     private Long customerDayId;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,7 +1,7 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
-import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus;
 
 import java.time.LocalDate;
@@ -16,22 +16,29 @@
     @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;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/DeliveryStatus.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/DeliveryStatus.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/DeliveryStatus.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -0,0 +1,28 @@
+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<Delivery> deliveries;
+}
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Manufacturer.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Manufacturer.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Manufacturer.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
@@ -13,16 +14,21 @@
     @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;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/OrderStatus.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/OrderStatus.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/OrderStatus.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -0,0 +1,28 @@
+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> orders;
+}
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,7 +1,7 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
-import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus;
 
 import java.time.LocalDate;
@@ -16,20 +16,25 @@
     @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")
+    @JoinColumn(name = "ord_status_id",nullable = false)
     private OrderStatus orderStatus;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Price.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Price.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Price.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
@@ -14,10 +15,13 @@
     @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;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProForma.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProForma.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProForma.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,7 +1,7 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
-import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus;
 
 import java.time.LocalDate;
@@ -14,10 +14,13 @@
     @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;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProFormaStatus.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProFormaStatus.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProFormaStatus.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -0,0 +1,28 @@
+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<ProForma> pro_formas;
+}
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Region.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Region.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Region.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
@@ -13,7 +14,9 @@
   @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;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Users.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Users.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Users.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -18,5 +18,5 @@
 @Data
 @Table(name = "users", schema = "IND0_185022")
-public abstract class Users implements UserDetails {
+public class Users implements UserDetails {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Vehicle.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Vehicle.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Vehicle.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
@@ -14,28 +15,37 @@
     @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;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Warehouse.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Warehouse.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Warehouse.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Data;
@@ -13,7 +14,9 @@
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "wh_id")
+    @JsonProperty("warehouseId")
     private Integer warehouseId;
 
     @Column(name = "wh_address", nullable = false)
+    @JsonProperty("warehouseAddress")
     private String warehouseAddress;
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Weekday.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Weekday.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Weekday.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import lombok.Getter;
@@ -15,7 +16,9 @@
     @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;
 
Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/DeliveryStatus.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/DeliveryStatus.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ 	(revision )
@@ -1,25 +1,0 @@
-package mk.ukim.finki.db.distributorapp.model.statuses;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import mk.ukim.finki.db.distributorapp.model.Delivery;
-
-import java.util.List;
-
-@Entity
-@Data
-public class DeliveryStatus {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "del_status_id")
-    private Short delivery_status_id;
-
-    @Column(name = "del_status_name", nullable = false)
-    private String delivery_status_name;
-
-    @Column(name = "del_status_desc", nullable = false)
-    private String delivery_status_description;
-
-    @OneToMany(mappedBy = "deliveryStatus")
-    private List<Delivery> deliveries;
-}
Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/OrderStatus.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/OrderStatus.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ 	(revision )
@@ -1,25 +1,0 @@
-package mk.ukim.finki.db.distributorapp.model.statuses;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import mk.ukim.finki.db.distributorapp.model.Orders;
-
-import java.util.List;
-
-@Entity
-@Data
-public class OrderStatus {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "ord_status_id")
-    private Short order_status_id;
-
-    @Column(name = "ord_status_name", nullable = false)
-    private String order_status_name;
-
-    @Column(name = "ord_status_desc", nullable = false)
-    private String order_status_description;
-
-    @OneToMany(mappedBy = "orderStatus")
-    private List<Orders> orders;
-}
Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/ProFormaStatus.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/ProFormaStatus.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ 	(revision )
@@ -1,25 +1,0 @@
-package mk.ukim.finki.db.distributorapp.model.statuses;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import mk.ukim.finki.db.distributorapp.model.ProForma;
-
-import java.util.List;
-
-@Entity
-@Data
-public class ProFormaStatus {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "pf_status_id")
-    private Short pro_forma_status_id;
-
-    @Column(name = "pf_status_name", nullable = false)
-    private String pro_forma_status_name;
-
-    @Column(name = "pf_status_desc", nullable = false)
-    private String pro_forma_status_description;
-
-    @OneToMany(mappedBy = "proFormaStatus")
-    private List<ProForma> pro_formas;
-}
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -16,6 +16,5 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    "select * " +
+            value = "select * " +
                     "from article"
     )
@@ -23,9 +22,8 @@
 
     @Query(
-            value = "set search_path = \"IND0_185022\"; " +
-                    "select * " +
+            nativeQuery = true,
+            value = "select * " +
                     "from article a " +
-                    "where a.art_name like :name",
-            nativeQuery = true
+                    "where a.art_name like :name"
     )
     List<Article> findAllByName(@NonNull @Param("name") String name);
@@ -33,6 +31,5 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    "select * " +
+            value = "select * " +
                     "from article a " +
                     "where a.art_id=:id"
@@ -44,8 +41,13 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    ""
+            value = "insert into article(art_name, art_image, art_weight, ctg_id, man_id) " +
+                    "values (:name,:image,:weight,:ctg,:man)"
     )
-    Optional<Article> create(String name, Integer weight, Long ctg_id, Long man_id);
+    Optional<Article> create(
+            @NonNull @Param("name") String name,
+            @NonNull @Param("image") String image,
+            @NonNull @Param("weight") Integer weight,
+            @NonNull @Param("ctg") Long ctg_id,
+            @NonNull @Param("man") Long man_id);
 
     @Modifying
@@ -53,8 +55,15 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    ""
+            value = "update article " +
+                    "set art_name=:name,art_image=:img,art_weight=:weight,ctg_id=:ctg,man_id=:man " +
+                    "where art_id=:id"
     )
-    Optional<Article> edit(Long id, String name, Integer weight, Long ctg_id, Long man_id);
+    Optional<Article> edit(
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("name") String name,
+            @NonNull @Param("img") String image,
+            @NonNull @Param("weight") Integer weight,
+            @NonNull @Param("ctg") Long ctg_id,
+            @NonNull @Param("man") Long man_id);
 
     @Modifying
@@ -62,7 +71,6 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    ""
+            value = "delete from article where art_id=:id"
     )
-    void delete(Long id);
+    void delete(@Param("id") Long id);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleUnitRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -16,6 +16,5 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    ""
+            value = "select * from article_unit"
     )
     List<ArticleUnit> listAll();
@@ -23,6 +22,7 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    ""
+            value = "select * " +
+                    "from article_unit au join article a on au.art_id = a.art_id " +
+                    "where a.art_name like :name"
     )
     List<ArticleUnit> findAllByName(@NonNull @Param("name") String name);
@@ -30,6 +30,5 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    ""
+            value = "select * from article_unit where unit_id=:id"
     )
     Optional<ArticleUnit> findById(@NonNull @Param("id") Long id);
@@ -37,8 +36,7 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    ""
+            value = "select * from article_unit where wh_id=:wh"
     )
-    List<ArticleUnit> findAllByWarehouse(Integer wh_id);
+    List<ArticleUnit> findAllByWarehouse(@NonNull @Param("wh") Integer wh_id);
 
     @Modifying
@@ -46,16 +44,16 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    ""
+            value = "insert into article_unit(unit_expiration_date, unit_serial_number, unit_batch_number, unit_manufacture_date, unit_cost_price, art_id, wh_id, ord_id) " +
+                    "values (:exp_date,:ser_no,:batch:no,:man_date,:cost_price,:art,:wh,:ord)"
     )
     Optional<ArticleUnit> create(
-            Date unit_exp_date,
-            String unit_ser_number,
-            String unit_batch_number,
-            Date unit_manufacture_date,
-            Double unit_cost_price,
-            Long art_id,
-            Integer wh_id,
-            Long ord_id
+            @NonNull @Param("exp_date") Date unit_exp_date,
+            @NonNull @Param("ser_no") String unit_ser_number,
+            @NonNull @Param("batch_no") String unit_batch_number,
+            @NonNull @Param("man_date") Date unit_manufacture_date,
+            @NonNull @Param("cost_price") Double unit_cost_price,
+            @NonNull @Param("art") Long art_id,
+            @NonNull @Param("wh") Integer wh_id,
+            @Param("ord") Long ord_id
     );
 
@@ -64,17 +62,18 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    ""
+            value = "update article_unit " +
+                    "set unit_expiration_date=:exp_date, unit_serial_number=:ser_no, unit_batch_number=:batch_no,unit_manufacture_date=:man_date,unit_cost_price=:cost_price,art_id=:art,wh_id=:wh,ord_id=:ord " +
+                    "where unit_id=:id"
     )
     Optional<ArticleUnit> edit(
-            Long id,
-            Date unit_exp_date,
-            String unit_ser_number,
-            String unit_batch_number,
-            Date unit_manufacture_date,
-            Double unit_cost_price,
-            Long art_id,
-            Integer wh_id,
-            Long ord_id
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("exp_date") Date unit_exp_date,
+            @NonNull @Param("ser_no") String unit_ser_number,
+            @NonNull @Param("batch_no") String unit_batch_number,
+            @NonNull @Param("man_date") Date unit_manufacture_date,
+            @NonNull @Param("cost_price") Double unit_cost_price,
+            @NonNull @Param("art") Long art_id,
+            @NonNull @Param("wh") Integer wh_id,
+            @Param("ord") Long ord_id
     );
 
@@ -83,7 +82,6 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    ""
+            value = "delete from article_unit where unit_id=:id"
     )
-    void delete(Long id);
+    void delete(@NonNull @Param("id") Long id);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CategoryRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -14,15 +14,8 @@
 public interface CategoryRepository extends JpaRepository<Category, Long> {
 
-//    @Query(
-//            value = "select * " +
-//                    "from category c " +
-//                    "where c.ctg_name like :name",
-//            nativeQuery = true)
-//    List<Category> findAllByName(@NonNull @Param("name") String name);
-
     @Query(
             value = "select * " +
                     "from category c " +
-                    "where c.ctg_name like ?1",
+                    "where c.ctg_name like :name",
             nativeQuery = true)
     List<Category> findAllByName(@NonNull @Param("name") String name);
@@ -37,30 +30,28 @@
             value = "select * " +
                     "from category c " +
-                    "where c.ctg_id = ?1",
+                    "where c.ctg_id=:id",
             nativeQuery = true
     )
-    Optional<Category> findById(@NonNull @Param("ctg_id") Long id);
+    Optional<Category> findById(@NonNull @Param("id") Long id);
 
     @Modifying
     @Transactional
     @Query(
-            value = "insert into category(ctg_name,ctg_desc) " +
-                    "values (:name, :desc)",
+            value = "insert into category(ctg_name) " +
+                    "values (:name)",
             nativeQuery = true
     )
-    Optional<Category> create(@NonNull @Param("name") String name,
-                              @NonNull @Param("desc") String desc);
+    Optional<Category> create(@NonNull @Param("name") String name);
 
     @Modifying
     @Transactional
     @Query(
-            value = "update category c " +
-                    "set c.ctg_name = :name, c.ctg_desc = :desc " +
-                    "where c.ctg_id = :id",
-            nativeQuery = true
+            nativeQuery = true,
+            value = "update category " +
+                    "set ctg_name=:name " +
+                    "where ctg_id=:id"
     )
-    Optional<Category> edit(@Param("id") Long id,
-                            @Param("name") String name,
-                            @Param("desc") String description);
+    Optional<Category> edit(@NonNull @Param("id") Long id,
+                            @NonNull @Param("name") String name);
 
     @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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CityRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.repository;
 
+import lombok.NonNull;
 import mk.ukim.finki.db.distributorapp.model.City;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -15,6 +16,5 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    "select * " +
+            value = "select * " +
                     "from city c"
     )
@@ -23,19 +23,17 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    "select * " +
+            value = "select * " +
                     "from city c " +
                     "where c.city_id = :id"
     )
-    Optional<City> findById(@Param("id") Long id);
+    Optional<City> findById(@NonNull @Param("id") Long id);
 
     @Query(
             nativeQuery = true,
-            value = "set search_path  = \"IND0_185022\"; " +
-                    "select * " +
+            value = "select * " +
                     "from city c " +
                     "where c.city_name like :name"
     )
-    List<City> findByName(@Param("name") String name);
+    List<City> findByName(@NonNull @Param("name") String name);
 
     @Modifying
@@ -43,8 +41,10 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path  = \"IND0_185022\"; " +
-                    "insert into city(city_name) values (:name)"
+            value = "insert into city(city_name, region_id) " +
+                    "values (:name,:region)"
     )
-    Optional<City> create(@Param("name") String name);
+    Optional<City> create(
+            @NonNull @Param("name") String name,
+            @NonNull @Param("region") Integer region);
 
     @Modifying
@@ -52,8 +52,12 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path  = \"IND0_185022\"; " +
-                    ""
+            value = "update city " +
+                    "set city_name=:name, region_id=:region " +
+                    "where city_id=:id"
     )
-    Optional<City> edit(Long id, String name);
+    Optional<City> edit(
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("name") String name,
+            @NonNull @Param("region") Integer region);
 
     @Modifying
@@ -61,9 +65,7 @@
     @Query(
             nativeQuery = true,
-            value = "set search_path = \"IND0_185022\"; " +
-                    "delete from city c " +
+            value = "delete from city c " +
                     "where c.city_id=:id"
     )
-    void deleteById(@Param("id") Long id);
-
+    void deleteById(@NonNull @Param("id") Long id);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ConfirmationTokenRepository.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ConfirmationTokenRepository.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ConfirmationTokenRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,7 +1,9 @@
 package mk.ukim.finki.db.distributorapp.repository;
 
+import lombok.NonNull;
 import mk.ukim.finki.db.distributorapp.security.ConfirmationToken;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface ConfirmationTokenRepository extends JpaRepository<ConfirmationToken, Long> {
@@ -9,6 +11,8 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * " +
+                    "from token " +
+                    "where t_value=:token"
     )
-    ConfirmationToken findConfirmationTokenByToken(String token);
+    ConfirmationToken findConfirmationTokenByToken(@NonNull @Param("token") String token);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CustomerRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -16,5 +16,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * " +
+                    "from customer"
     )
     List<Customer> listAll();
@@ -22,5 +23,7 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * " +
+                    "from customer c " +
+                    "where cust_company_name like :name"
     )
     List<Customer> findAllByName(@NonNull @Param("name") String name);
@@ -28,5 +31,7 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * " +
+                    "from customer " +
+                    "where user_id=:id"
     )
     Optional<Customer> findById(@NonNull @Param("id") Long id);
@@ -36,7 +41,15 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "insert into customer(user_id, cust_edb, cust_company_name, cust_address, cust_open_time, cust_close_time, cust_representative_img) " +
+                    "values (:id,:edb,:name,:adr,:oTime,:cTime,:img)"
     )
-    Optional<Customer> create(String customerEDB, String customerName, String customerStreet, LocalTime openTime, LocalTime closeTime, String customerImage);
+    Optional<Customer> create(
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("edb") String customerEDB,
+            @NonNull @Param("name") String customerName,
+            @NonNull @Param("adr") String customerStreet,
+            @NonNull @Param("oTime") LocalTime openTime,
+            @NonNull @Param("cTime") LocalTime closeTime,
+            @NonNull @Param("img") String customerImage);
 
     @Modifying
@@ -44,7 +57,16 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "update customer " +
+                    "set cust_edb=:edb,cust_company_name=:name,cust_address=:adr,cust_open_time=:oTime,cust_close_time=:cTime,cust_representative_img=:img " +
+                    "where user_id=:id"
     )
-    Optional<Customer> edit(Long id, String customerEDB, String customerName, String customerStreet, LocalTime openTime, LocalTime closeTime, String customerImage);
+    Optional<Customer> edit(
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("edb") String customerEDB,
+            @NonNull @Param("name") String customerName,
+            @NonNull @Param("adr") String customerStreet,
+            @NonNull @Param("oTime") LocalTime openTime,
+            @NonNull @Param("cTime") LocalTime closeTime,
+            @NonNull @Param("img") String customerImage);
 
     @Modifying
@@ -52,6 +74,7 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "delete from customer " +
+                    "where user_id=:id"
     )
-    void delete(Long id);
+    void delete(@NonNull @Param("id") Long id);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -17,5 +17,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from delivery"
     )
     List<Delivery> listAll();
@@ -23,11 +23,12 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from delivery " +
+                    "where veh_id=:veh"
     )
-    List<Delivery> findAllByVehicle(@NonNull @Param("vehicle") Integer veh_id);
+    List<Delivery> findAllByVehicle(@NonNull @Param("veh") Integer veh_id);
 
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from delivery where del_id=:id"
     )
     Optional<Delivery> findById(@NonNull @Param("id") Long id);
@@ -35,5 +36,8 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select d.* " +
+                    "from delivery d join vehicle v on d.veh_id = v.veh_id " +
+                    "join driver dr on v.veh_id = dr.veh_id " +
+                    "where dr.user_id=:driver"
     )
     List<Delivery> findDeliveriesByDriver(@NonNull @Param("driver") Long driver_id);
@@ -43,15 +47,16 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "insert into delivery(del_date_created, del_date, del_start_km, del_end_km, del_start_time, del_end_time, del_status_id, veh_id) " +
+                    "values (:dCreated,:dDel,:startKm,:endKm,:startT,:endT,:status,:veh)"
     )
     Optional<Delivery> create(
-            LocalDate del_date_created,
-            LocalDate del_date,
-            Integer del_start_km,
-            Integer del_end_km,
-            LocalTime del_start_time,
-            LocalTime del_end_time,
-            Short del_status_id,
-            Integer veh_id
+            @NonNull @Param("dCreated") LocalDate del_date_created,
+            @NonNull @Param("dDel") LocalDate del_date,
+            @NonNull @Param("startKm") Integer del_start_km,
+            @NonNull @Param("endKm") Integer del_end_km,
+            @NonNull @Param("startT") LocalTime del_start_time,
+            @NonNull @Param("endT") LocalTime del_end_time,
+            @NonNull @Param("status") Short del_status_id,
+            @NonNull @Param("veh") Integer veh_id
     );
 
@@ -60,16 +65,18 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "update delivery " +
+                    "set del_date_created=:dCreated,del_date=:dDel,del_start_km=:startKm,del_end_km=:endKm,del_start_time=:startTime,del_end_time=:endT,del_status_id=:status,veh_id=:veh " +
+                    "where del_id=:id"
     )
     Optional<Delivery> edit(
-            Long id,
-            LocalDate del_date_created,
-            LocalDate del_date,
-            Integer del_start_km,
-            Integer del_end_km,
-            LocalTime del_start_time,
-            LocalTime del_end_time,
-            Short del_status_id,
-            Integer veh_id
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("dCreated") LocalDate del_date_created,
+            @NonNull @Param("dDel") LocalDate del_date,
+            @NonNull @Param("startKm") Integer del_start_km,
+            @NonNull @Param("endKm") Integer del_end_km,
+            @NonNull @Param("startT") LocalTime del_start_time,
+            @NonNull @Param("endT") LocalTime del_end_time,
+            @NonNull @Param("status") Short del_status_id,
+            @NonNull @Param("veh") Integer veh_id
     );
 
@@ -78,6 +85,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "delete from delivery where del_id=:id"
     )
-    void delete(Long id);
+    void delete(@NonNull @Param("id") Long id);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryStatusRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -2,5 +2,5 @@
 
 import lombok.NonNull;
-import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus;
+import mk.ukim.finki.db.distributorapp.model.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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -15,5 +15,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from driver"
     )
     List<Driver> listAll();
@@ -21,5 +21,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select d.* from driver d join users u on d.user_id = u.user_id " +
+                    "where u.user_name like :name"
     )
     List<Driver> findAllByName(@NonNull @Param("name") String name);
@@ -27,5 +28,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from driver where user_id=:id"
     )
     Optional<Driver> findById(@NonNull @Param("id") Long id);
@@ -35,7 +36,10 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "insert into driver(user_id, veh_id) " +
+                    "values (:id,:veh)"
     )
-    Optional<Driver> create(Long usr_id, Integer veh_id);
+    Optional<Driver> create(
+            @NonNull @Param("id") Long usr_id,
+            @NonNull @Param("veh") Integer veh_id);
 
     @Modifying
@@ -43,7 +47,11 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "update driver " +
+                    "set veh_id=:veh " +
+                    "where user_id=:id"
     )
-    Optional<Driver> edit(Long usr_id, Integer veh_id);
+    Optional<Driver> edit(
+            @NonNull @Param("id") Long usr_id,
+            @NonNull @Param("veh") Integer veh_id);
 
     @Modifying
@@ -51,6 +59,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "delete from driver where user_id=:id"
     )
-    void delete(Long id);
+    void delete(@NonNull @Param("id") Long id);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManagerRepository.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManagerRepository.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManagerRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -15,5 +15,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from manager"
     )
     List<Manager> listAll();
@@ -21,5 +21,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from manager m join users u on m.user_id = u.user_id " +
+                    "where user_name like :name"
     )
     List<Manager> findAllByName(@NonNull @Param("name") String name);
@@ -27,5 +28,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from manager where user_id=:id"
     )
     Optional<Manager> findById(@NonNull @Param("id") Long id);
@@ -35,7 +36,10 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "insert into manager(user_id, wh_id) " +
+                    "values (:id,:wh)"
     )
-    Optional<Manager> create(Long id, Integer whId);
+    Optional<Manager> create(
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("wh") Integer whId);
 
     @Modifying
@@ -43,7 +47,11 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "update manager " +
+                    "set wh_id=:wh " +
+                    "where user_id=:id"
     )
-    Optional<Manager> edit(Long id, Integer whId);
+    Optional<Manager> edit(
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("wh") Integer whId);
 
     @Modifying
@@ -51,6 +59,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "delete from manager where user_id=:id"
     )
-    void delete(Long id);
+    void delete(@NonNull @Param("id") Long id);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManufacturerRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -15,5 +15,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from manufacturer"
     )
     List<Manufacturer> listAll();
@@ -21,5 +21,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from manufacturer where man_name like :name"
     )
     List<Manufacturer> findAllByName(@NonNull @Param("name") String name);
@@ -27,5 +27,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from manufacturer where man_id=:id"
     )
     Optional<Manufacturer> findById(@NonNull @Param("id") Long id);
@@ -35,7 +35,12 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "insert into manufacturer(man_name, man_address, man_mobile, man_email) " +
+                    "values (:name,:adr,:mob,:email)"
     )
-    Optional<Manufacturer> create(String name, String address, String mobile, String email);
+    Optional<Manufacturer> create(
+            @NonNull @Param("name") String name,
+            @NonNull @Param("adr") String address,
+            @NonNull @Param("mob") String mobile,
+            @NonNull @Param("email") String email);
 
     @Modifying
@@ -43,7 +48,14 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "update manufacturer " +
+                    "set man_name=:name,man_address=:adr,man_mobile=:mob,man_email=:email " +
+                    "where man_id=:id"
     )
-    Optional<Manufacturer> edit(Long id, String name, String address, String mobile, String email);
+    Optional<Manufacturer> edit(
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("name") String name,
+            @NonNull @Param("adr") String address,
+            @NonNull @Param("mob") String mobile,
+            @NonNull @Param("email") String email);
 
     @Modifying
@@ -51,6 +63,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "delete from manufacturer where man_id=:id"
     )
-    void delete();
+    void delete(@NonNull @Param("id") Long id);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrderStatusRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -2,5 +2,5 @@
 
 import lombok.NonNull;
-import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus;
+import mk.ukim.finki.db.distributorapp.model.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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -23,5 +23,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from orders where cust_id=:cust"
     )
     List<Orders> findByCustomer(@NonNull @Param("cust") Long id);
@@ -29,5 +29,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from orders where ord_id=:id"
     )
     Optional<Orders> findById(@NonNull @Param("id") Long id);
@@ -37,15 +37,16 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "insert into orders (ord_date, ord_sum, ord_fulfillment_date, ord_comment, ord_status_id, cust_id, del_id, pf_id) " +
+                    "values (:date,:sum,:fulDate,:comment,:status,:cust,:del,:pf)"
     )
     Optional<Orders> create(
-            LocalDate ord_date,
-            Integer ord_sum,
-            LocalDateTime ord_fulfillment_date,
-            String ord_comment,
-            Short ord_status_id,
-            Long cust_id,
-            Long del_id,
-            Long pf_id
+            @NonNull @Param("date") LocalDate ord_date,
+            @NonNull @Param("sum") Integer ord_sum,
+            @Param("fulDate") LocalDateTime ord_fulfillment_date,
+            @Param("comment") String ord_comment,
+            @NonNull @Param("status") Short ord_status_id,
+            @NonNull @Param("cust") Long cust_id,
+            @NonNull @Param("del") Long del_id,
+            @NonNull @Param("pf") Long pf_id
     );
 
@@ -54,16 +55,18 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "update orders " +
+                    "set ord_date=:date,ord_sum=:sum,ord_fulfillment_date=:fulDate,ord_comment=:comment,ord_status_id=:status,cust_id=:cust,del_id=:del,pf_id=:pf " +
+                    "where ord_id=:id"
     )
     Optional<Orders> edit(
-            Long id,
-            LocalDate ord_date,
-            Integer ord_sum,
-            LocalDateTime ord_fulfillment_date,
-            String ord_comment,
-            Short ord_status_id,
-            Long cust_id,
-            Long del_id,
-            Long pf_id
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("date") LocalDate ord_date,
+            @NonNull @Param("sum") Integer ord_sum,
+            @Param("fulDate") LocalDateTime ord_fulfillment_date,
+            @Param("comment") String ord_comment,
+            @NonNull @Param("status") Short ord_status_id,
+            @NonNull @Param("cust") Long cust_id,
+            @NonNull @Param("del") Long del_id,
+            @NonNull @Param("pf") Long pf_id
     );
 
@@ -72,6 +75,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "delete from orders where ord_id=:id"
     )
-    void delete();
+    void delete(@NonNull @Param("id") Long id);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/PriceRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -17,5 +17,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from price"
     )
     List<Price> listAll();
@@ -23,11 +23,11 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from price where art_id=:art"
     )
-    List<Price> findAllByArticleId(@NonNull @Param("id") Long id);
+    List<Price> findAllByArticleId(@NonNull @Param("art") Long id);
 
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from price where price_id=:id"
     )
     Optional<Price> findById(@NonNull @Param("id") Short id);
@@ -37,7 +37,11 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "insert into price(price, price_eff_date, art_id) " +
+                    "values (:price,:effD,:art)"
     )
-    Optional<Price> create(BigDecimal price, LocalDateTime price_eff_date, Long art_id);
+    Optional<Price> create(
+            @NonNull @Param("price") BigDecimal price,
+            @NonNull @Param("effD") LocalDateTime price_eff_date,
+            @NonNull @Param("art") Long art_id);
 
     @Modifying
@@ -45,7 +49,13 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "update price " +
+                    "set price=:price,price_eff_date=:effD,art_id=:art " +
+                    "where price_id=:id"
     )
-    Optional<Price> edit(Integer id, BigDecimal price, LocalDateTime price_eff_date, Long art_id);
+    Optional<Price> edit(
+            @NonNull @Param("id") Integer id,
+            @NonNull @Param("price") BigDecimal price,
+            @NonNull @Param("effD") LocalDateTime price_eff_date,
+            @NonNull @Param("art") Long art_id);
 
     @Modifying
@@ -53,6 +63,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "delete from price where price_id=:id"
     )
-    void delete(Integer id);
+    void delete(@NonNull @Param("id") Integer id);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -16,5 +16,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from pro_forma"
     )
     List<ProForma> listAll();
@@ -22,5 +22,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from pro_forma where pf_id=:id"
     )
     Optional<ProForma> findById(@NonNull @Param("id") Short id);
@@ -30,7 +30,11 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "insert into pro_forma(pf_deadline, pf_date_created, pf_status_id) " +
+                    "values (:ddl,:createD,:status)"
     )
-    Optional<ProForma> create(LocalDate pf_deadline, LocalDate pf_create_date, Short pf_status_id, Long order_id);
+    Optional<ProForma> create(
+            @NonNull @Param("ddl") LocalDate pf_deadline,
+            @NonNull @Param("createD") LocalDate pf_create_date,
+            @NonNull @Param("status") Short pf_status_id);
 
     @Modifying
@@ -38,7 +42,13 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "update pro_forma " +
+                    "set pf_deadline=:ddl,pf_date_created=:createD,pf_status_id=:status " +
+                    "where pf_id=:id"
     )
-    Optional<ProForma> edit(Long pf_id, LocalDate pf_deadline, LocalDate pf_create_date, Short pf_status_id, Long order_id);
+    Optional<ProForma> edit(
+            @NonNull @Param("id") Long pf_id,
+            @NonNull @Param("ddl") LocalDate pf_deadline,
+            @NonNull @Param("createD") LocalDate pf_create_date,
+            @NonNull @Param("status") Short pf_status_id);
 
     @Modifying
@@ -46,6 +56,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "delete from pro_forma where pf_id=:id"
     )
-    void delete();
+    void delete(@NonNull @Param("id") Long id);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaStatusRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -2,5 +2,5 @@
 
 import lombok.NonNull;
-import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus;
+import mk.ukim.finki.db.distributorapp.model.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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/RegionRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,7 +1,68 @@
 package mk.ukim.finki.db.distributorapp.repository;
 
+import lombok.NonNull;
 import mk.ukim.finki.db.distributorapp.model.Region;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Optional;
 
 public interface RegionRepository extends JpaRepository<Region, Long> {
+    @Query(
+            nativeQuery = true,
+            value = "select * " +
+                    "from region c"
+    )
+    List<Region> listAll();
+
+    @Query(
+            nativeQuery = true,
+            value = "select * " +
+                    "from region " +
+                    "where region_id=:id"
+    )
+    Optional<Region> findById(@NonNull @Param("id") Long id);
+
+    @Query(
+            nativeQuery = true,
+            value = "select * " +
+                    "from region " +
+                    "where region.region_name like :name"
+    )
+    List<Region> findByName(@NonNull @Param("name") String name);
+
+    @Modifying
+    @Transactional
+    @Query(
+            nativeQuery = true,
+            value = "insert into region(region_name) " +
+                    "values (:name)"
+    )
+    Optional<Region> create(
+            @NonNull @Param("name") String name);
+
+    @Modifying
+    @Transactional
+    @Query(
+            nativeQuery = true,
+            value = "update region " +
+                    "set region_name=:name " +
+                    "where region_id=:id"
+    )
+    Optional<Region> edit(
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("name") String name);
+
+    @Modifying
+    @Transactional
+    @Query(
+            nativeQuery = true,
+            value = "delete from region " +
+                    "where region_id=:id"
+    )
+    void deleteById(@NonNull @Param("id") Long id);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/UsersRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -15,5 +15,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from users"
     )
     List<Users> listAll();
@@ -21,5 +21,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from users where user_name like :name"
     )
     List<Users> findAllByName(@NonNull @Param("name") String name);
@@ -27,5 +27,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from users where user_id=:id"
     )
     Optional<Users> findById(@NonNull @Param("id") Short id);
@@ -35,8 +35,17 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "insert into users(user_name, user_surname, user_pass, user_salt, user_email, user_mobile, user_email_conf, user_image, city_id) " +
+                    "values (:name,:sur,:pass,:salt,:email,:mob,:active,:img,:cty)"
     )
-    Users create(String name, String surname, String password, String email,
-                 String mobile, String salt, Boolean active, String image, Long city_id);
+    Users create(
+            @NonNull @Param("name") String name,
+            @NonNull @Param("sur") String surname,
+            @NonNull @Param("pass") String password,
+            @NonNull @Param("email") String email,
+            @NonNull @Param("mob") String mobile,
+            @NonNull @Param("salt") String salt,
+            @NonNull @Param("active") Boolean active,
+            @NonNull @Param("img") String image,
+            @NonNull @Param("cty") Long city_id);
 
     @Modifying
@@ -44,7 +53,19 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "update users " +
+                    "set user_name=:name,user_surname=:sur,user_pass=:pass,user_email=:email,user_mobile=:mob,user_salt=:salt,user_email_conf=:active,user_image=:img,city_id=:cty " +
+                    "where user_id=:id"
     )
-    Optional<Users> edit();
+    Optional<Users> edit(
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("name") String name,
+            @NonNull @Param("sur") String surname,
+            @NonNull @Param("pass") String password,
+            @NonNull @Param("email") String email,
+            @NonNull @Param("mob") String mobile,
+            @NonNull @Param("salt") String salt,
+            @NonNull @Param("active") Boolean active,
+            @NonNull @Param("img") String image,
+            @NonNull @Param("cty") Long city_id);
 
     @Modifying
@@ -52,12 +73,15 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "delete from users where user_id=:id"
     )
-    void delete();
+    void delete(@NonNull @Param("id") Long id);
 
     ////////////////////////////////////////////////
+    // TODO: Update the queries bellow.
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * " +
+                    "from users " +
+                    "where user_email like :email"
     )
     Optional<Users> findUserByUserEmailIgnoreCase(@NonNull @Param("email") String email);
@@ -65,12 +89,17 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * " +
+                    "from users " +
+                    "where user_email:email and user_pass=:pass"
     )
-    Optional<Users> findUserByUserNameAndUserPassword(String pass, String username);
+    Optional<Users> findUserByUserNameAndUserPassword(
+            @NonNull @Param("pass") String password,
+            @NonNull @Param("email") String email);
 
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from users where user_email=:email"
     )
-    Optional<Users> findUserByUserName(String username);
+    Optional<Users> findUserByUserName(
+            @NonNull @Param("email") String username);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -16,5 +16,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from vehicle"
     )
     List<Vehicle> listAll();
@@ -22,5 +22,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from vehicle where wh_id=:wh"
     )
     List<Vehicle> findAllByWarehouse(@NonNull @Param("wh") Integer warehouseId);
@@ -28,5 +28,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from vehicle where veh_id=:id"
     )
     Optional<Vehicle> findById(@NonNull @Param("id") Integer id);
@@ -36,9 +36,17 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "insert into vehicle(veh_carry_weight, veh_service_interval, veh_kilometers, veh_last_service, veh_last_service_km, veh_plate, veh_vin, veh_reg, wh_id) " +
+                    "values (:carryW,:serInterval,:vehKm,:lastSerD,:lastSerKm,:plate,:vin,:vehRegD,:wh)"
     )
-    Optional<Vehicle> create(Integer vehicleCarryWeight, Short vehicleServiceInterval, Integer vehicleKilometers,
-                             LocalDate vehicleLastService, Integer vehicleLastServiceKm, String vehiclePlate,
-                             String vehicleVIN, LocalDate vehicleRegDate, Integer whId, Long driverId);
+    Optional<Vehicle> create(
+            @NonNull @Param("carryW") Integer vehicleCarryWeight,
+            @NonNull @Param("serInterval") Short vehicleServiceInterval,
+            @NonNull @Param("vehKm") Integer vehicleKilometers,
+            @NonNull @Param("lastSerD") LocalDate vehicleLastService,
+            @NonNull @Param("lastSerKm") Integer vehicleLastServiceKm,
+            @NonNull @Param("plate") String vehiclePlate,
+            @NonNull @Param("vin") String vehicleVIN,
+            @NonNull @Param("vehRegD") LocalDate vehicleRegDate,
+            @NonNull @Param("wh") Integer whId);
 
     @Modifying
@@ -46,9 +54,20 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "update vehicle " +
+                    "set veh_carry_weight=:carryW,veh_service_interval=:serInterval,veh_kilometers=:vehKm," +
+                    "veh_last_service=:lastSerD,veh_last_service_km=:lastSerKm,veh_plate=:plate,veh_vin=:vin,veh_reg=:vehRegD,wh_id=:wh " +
+                    "where veh_id=:id"
     )
-    Optional<Vehicle> edit(Integer id, Integer vehicleCarryWeight, Short vehicleServiceInterval, Integer vehicleKilometers,
-                           LocalDate vehicleLastService, Integer vehicleLastServiceKm, String vehiclePlate,
-                           String vehicleVIN, LocalDate vehicleRegDate, Integer whId, Long driverId);
+    Optional<Vehicle> edit(
+            @NonNull @Param("id") Integer id,
+            @NonNull @Param("carryW") Integer vehicleCarryWeight,
+            @NonNull @Param("serInterval") Short vehicleServiceInterval,
+            @NonNull @Param("vehKm") Integer vehicleKilometers,
+            @NonNull @Param("lastSerD") LocalDate vehicleLastService,
+            @NonNull @Param("lastSerKm") Integer vehicleLastServiceKm,
+            @NonNull @Param("plate") String vehiclePlate,
+            @NonNull @Param("vin") String vehicleVIN,
+            @NonNull @Param("vehRegD") LocalDate vehicleRegDate,
+            @NonNull @Param("wh") Integer whId);
 
     @Modifying
@@ -56,6 +75,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "delete from vehicle where veh_id=:id"
     )
-    void delete(Integer id);
+    void delete(@NonNull @Param("id") Integer id);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WarehouseRepository.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -15,5 +15,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from warehouse"
     )
     List<Warehouse> listAll();
@@ -21,5 +21,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from warehouse where city_id=:city"
     )
     List<Warehouse> findAllByCity(@NonNull @Param("city") Long city);
@@ -27,5 +27,5 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "select * from warehouse where wh_id=:id"
     )
     Optional<Warehouse> findById(@NonNull @Param("id") Short id);
@@ -35,7 +35,10 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "insert into warehouse(wh_address, city_id) " +
+                    "values (:adr,:cty)"
     )
-    Optional<Warehouse> create(String whAddress, Long city);
+    Optional<Warehouse> create(
+            @NonNull @Param("adr") String whAddress,
+            @NonNull @Param("cty") Long city);
 
     @Modifying
@@ -43,7 +46,12 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "update warehouse " +
+                    "set wh_address=:adr,city_id=:cty " +
+                    "where wh_id=:id"
     )
-    Optional<Warehouse> edit(Long id, String whAddress, Long city);
+    Optional<Warehouse> edit(
+            @NonNull @Param("id") Long id,
+            @NonNull @Param("adr") String whAddress,
+            @NonNull @Param("cty") Long city);
 
     @Modifying
@@ -51,6 +59,6 @@
     @Query(
             nativeQuery = true,
-            value = ""
+            value = "delete from warehouse where wh_id=:id"
     )
-    void delete();
+    void delete(@NonNull @Param("id") Long id);
 }
Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/security/JwtUtil.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/JwtUtil.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ 	(revision )
@@ -1,20 +1,0 @@
-package mk.ukim.finki.db.distributorapp.security;
-
-import io.jsonwebtoken.Jwts;
-import org.springframework.stereotype.Component;
-
-import javax.crypto.spec.SecretKeySpec;
-import java.security.Key;
-
-@Component
-public class JwtUtil {
-  private static final String SECRET_KEY = "secret";
-  private static final long EXPIRATION_TIME = 1000*60*60*10;
-
-  private final Key key = new SecretKeySpec(SECRET_KEY.getBytes(), "HmacSHA1");
-
-  public String generateToken(String username){
-    return Jwts.builder()
-      .setSubject(username)
-  }
-}
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleService.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -20,4 +20,4 @@
     Optional<Article> editById(Article article);
 
-    Optional<Article> create(String name, Integer weight, Category category, Manufacturer manufacturer);
+    Optional<Article> create(String name, String image, Integer weight, Category category, Manufacturer manufacturer);
 }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CategoryService.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -12,7 +12,7 @@
     Optional<Category> getCategoryById(Long id);
 
-    Optional<Category> createCategory(String name, String description);
+    Optional<Category> createCategory(String name);
 
-    Optional<Category> updateCategory(Long id, String name, String description);
+    Optional<Category> updateCategory(Long id, String name);
 
     void delete(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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CityService.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -2,4 +2,5 @@
 
 import mk.ukim.finki.db.distributorapp.model.City;
+import mk.ukim.finki.db.distributorapp.model.Region;
 
 import java.util.List;
@@ -12,7 +13,7 @@
     Optional<City> getCityById(Long id);
 
-    Optional<City> create(String name);
+    Optional<City> create(String name, Region region);
 
-    Optional<City> edit(Long id, String name);
+    Optional<City> edit(Long id, String name, Region region);
 
     void delete(Long id);
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerService.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -15,5 +15,5 @@
     Optional<Customer> findCustomerById(Long id);
 
-    Optional<Customer> create(String customerEDB, String customerName,
+    Optional<Customer> create(Long userId, String customerEDB, String customerName,
                               String customerStreet, LocalTime openTime, LocalTime closeTime, String customerImage);
 
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -4,5 +4,5 @@
 import mk.ukim.finki.db.distributorapp.model.Driver;
 import mk.ukim.finki.db.distributorapp.model.Vehicle;
-import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus;
+import mk.ukim.finki.db.distributorapp.model.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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryStatusService.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,5 +1,5 @@
 package mk.ukim.finki.db.distributorapp.service;
 
-import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus;
+import mk.ukim.finki.db.distributorapp.model.DeliveryStatus;
 
 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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrderStatusService.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,5 +1,5 @@
 package mk.ukim.finki.db.distributorapp.service;
 
-import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus;
+import mk.ukim.finki.db.distributorapp.model.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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -5,5 +5,5 @@
 import mk.ukim.finki.db.distributorapp.model.Orders;
 import mk.ukim.finki.db.distributorapp.model.ProForma;
-import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus;
+import mk.ukim.finki.db.distributorapp.model.OrderStatus;
 
 import java.time.LocalDate;
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,7 +1,6 @@
 package mk.ukim.finki.db.distributorapp.service;
 
-import mk.ukim.finki.db.distributorapp.model.Orders;
 import mk.ukim.finki.db.distributorapp.model.ProForma;
-import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus;
+import mk.ukim.finki.db.distributorapp.model.ProFormaStatus;
 
 import java.time.LocalDate;
@@ -14,7 +13,7 @@
     Optional<ProForma> findProFormaById(Long id);
 
-    Optional<ProForma> create(LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status, Orders order);
+    Optional<ProForma> create(LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status);
 
-    Optional<ProForma> edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status, Orders order);
+    Optional<ProForma> edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status);
 
     void delete(Long id);
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaStatusService.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,5 +1,5 @@
 package mk.ukim.finki.db.distributorapp.service;
 
-import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus;
+import mk.ukim.finki.db.distributorapp.model.ProFormaStatus;
 
 import java.util.List;
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/VehicleService.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,5 +1,4 @@
 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.Warehouse;
@@ -17,9 +16,9 @@
     Optional<Vehicle> createVehicle(Integer vehicleCarryWeight, Short vehicleServiceInterval, Integer vehicleKilometers,
                                     LocalDate vehicleLastService, Integer vehicleLastServiceKm, String vehiclePlate,
-                                    String vehicleVIN, LocalDate vehicleRegDate, Warehouse warehouse, Driver driver);
+                                    String vehicleVIN, LocalDate vehicleRegDate, Warehouse warehouse);
 
     Optional<Vehicle> updateVehicle(Integer id, Integer vehicleCarryWeight, Short vehicleServiceInterval, Integer vehicleKilometers,
                                     LocalDate vehicleLastService, Integer vehicleLastServiceKm, String vehiclePlate,
-                                    String vehicleVIN, LocalDate vehicleRegDate, Warehouse warehouse, Driver driver);
+                                    String vehicleVIN, LocalDate vehicleRegDate, Warehouse warehouse);
 
     void deleteVehicleById(Integer id);
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleServiceImpl.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -42,5 +42,7 @@
     public Optional<Article> editById(Article article) {
         return this.articleRepository.edit(
-                article.getArticleId(), article.getArticleName(),
+                article.getArticleId(),
+                article.getArticleName(),
+                article.getArtImage(),
                 article.getArticleWeight(),
                 article.getCategory().getCategoryId(),
@@ -49,7 +51,8 @@
 
     @Override
-    public Optional<Article> create(String name, Integer weight, Category category, Manufacturer manufacturer) {
+    public Optional<Article> create(String name, String image, Integer weight, Category category, Manufacturer manufacturer) {
         return this.articleRepository.create(
                 name,
+                image,
                 weight,
                 category.getCategoryId(),
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CategoryServiceImpl.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -33,14 +33,14 @@
 
     @Override
-    public Optional<Category> createCategory(String name, String description) {
+    public Optional<Category> createCategory(String name) {
         if (categoryInvalid(name)) {
             throw new IllegalArgumentException();
         }
-        return this.categoryRepository.create(name, description);
+        return this.categoryRepository.create(name);
     }
 
     @Override
-    public Optional<Category> updateCategory(Long id, String name, String description) {
-        return this.categoryRepository.edit(id, name, description);
+    public Optional<Category> updateCategory(Long id, String name) {
+        return this.categoryRepository.edit(id, name);
     }
 
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CityServiceImpl.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -2,4 +2,5 @@
 
 import mk.ukim.finki.db.distributorapp.model.City;
+import mk.ukim.finki.db.distributorapp.model.Region;
 import mk.ukim.finki.db.distributorapp.repository.CityRepository;
 import mk.ukim.finki.db.distributorapp.service.CityService;
@@ -28,11 +29,11 @@
 
     @Override
-    public Optional<City> create(String name) {
-        return this.cityRepository.create(name);
+    public Optional<City> create(String name, Region region) {
+        return this.cityRepository.create(name, region.getRegionId());
     }
 
     @Override
-    public Optional<City> edit(Long id, String name) {
-        return this.cityRepository.edit(id, name);
+    public Optional<City> edit(Long id, String name, Region region) {
+        return this.cityRepository.edit(id, name, region.getRegionId());
     }
 
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerServiceImpl.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -35,6 +35,6 @@
 
     @Override
-    public Optional<Customer> create(String customerEDB, String customerName, String customerStreet, LocalTime openTime, LocalTime closeTime, String customerImage) {
-        return this.customerRepository.create(customerEDB, customerName, customerStreet, openTime, closeTime, customerImage);
+    public Optional<Customer> create(Long userId, String customerEDB, String customerName, String customerStreet, LocalTime openTime, LocalTime closeTime, String customerImage) {
+        return this.customerRepository.create(userId,customerEDB, customerName, customerStreet, openTime, closeTime, customerImage);
     }
 
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -4,5 +4,5 @@
 import mk.ukim.finki.db.distributorapp.model.Driver;
 import mk.ukim.finki.db.distributorapp.model.Vehicle;
-import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus;
+import mk.ukim.finki.db.distributorapp.model.DeliveryStatus;
 import mk.ukim.finki.db.distributorapp.repository.DeliveryRepository;
 import mk.ukim.finki.db.distributorapp.service.DeliveryService;
@@ -51,5 +51,5 @@
                 del_start_time,
                 del_end_time,
-                del_status.getDelivery_status_id(),
+                del_status.getDeliveryStatusId(),
                 vehicle.getVehicleId()
         );
@@ -66,5 +66,5 @@
                 del_start_time,
                 del_end_time,
-                del_status.getDelivery_status_id(),
+                del_status.getDeliveryStatusId(),
                 vehicle.getVehicleId()
         );
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryStatusServiceImpl.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,5 +1,5 @@
 package mk.ukim.finki.db.distributorapp.service.impl;
 
-import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus;
+import mk.ukim.finki.db.distributorapp.model.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/OrderStatusServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrderStatusServiceImpl.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrderStatusServiceImpl.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,5 +1,5 @@
 package mk.ukim.finki.db.distributorapp.service.impl;
 
-import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus;
+import mk.ukim.finki.db.distributorapp.model.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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -5,5 +5,5 @@
 import mk.ukim.finki.db.distributorapp.model.Orders;
 import mk.ukim.finki.db.distributorapp.model.ProForma;
-import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus;
+import mk.ukim.finki.db.distributorapp.model.OrderStatus;
 import mk.ukim.finki.db.distributorapp.repository.OrdersRepository;
 import mk.ukim.finki.db.distributorapp.service.OrdersService;
@@ -45,5 +45,5 @@
                 ord_fulfillment_date,
                 ord_comment,
-                ord_status.getOrder_status_id(),
+                ord_status.getOrderStatusId(),
                 customer.getUserId(),
                 delivery.getDeliveryId(),
@@ -60,5 +60,5 @@
                 ord_fulfillment_date,
                 ord_comment,
-                ord_status.getOrder_status_id(),
+                ord_status.getOrderStatusId(),
                 customer.getUserId(),
                 delivery.getDeliveryId(),
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,7 +1,6 @@
 package mk.ukim.finki.db.distributorapp.service.impl;
 
-import mk.ukim.finki.db.distributorapp.model.Orders;
 import mk.ukim.finki.db.distributorapp.model.ProForma;
-import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus;
+import mk.ukim.finki.db.distributorapp.model.ProFormaStatus;
 import mk.ukim.finki.db.distributorapp.repository.ProFormaRepository;
 import mk.ukim.finki.db.distributorapp.service.ProFormaService;
@@ -31,21 +30,19 @@
 
     @Override
-    public Optional<ProForma> create(LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status, Orders order) {
+    public Optional<ProForma> create(LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status) {
         return this.proFormaRepository.create(
                 pf_deadline,
                 pf_create_date,
-                pf_status.getPro_forma_status_id(),
-                order.getOrderId()
+                pf_status.getProFormaStatusId()
         );
     }
 
     @Override
-    public Optional<ProForma> edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status, Orders order) {
+    public Optional<ProForma> edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status) {
         return this.proFormaRepository.edit(
                 id,
                 pf_deadline,
                 pf_create_date,
-                pf_status.getPro_forma_status_id(),
-                order.getOrderId()
+                pf_status.getProFormaStatusId()
         );
     }
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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaStatusServiceImpl.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,5 +1,5 @@
 package mk.ukim.finki.db.distributorapp.service.impl;
 
-import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus;
+import mk.ukim.finki.db.distributorapp.model.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/VehicleServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,5 +1,4 @@
 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.Warehouse;
@@ -33,8 +32,8 @@
     public Optional<Vehicle> createVehicle(Integer vehicleCarryWeight, Short vehicleServiceInterval, Integer vehicleKilometers,
                                            LocalDate vehicleLastService, Integer vehicleLastServiceKm, String vehiclePlate,
-                                           String vehicleVIN, LocalDate vehicleRegDate, Warehouse warehouse, Driver driver) {
+                                           String vehicleVIN, LocalDate vehicleRegDate, Warehouse warehouse) {
 
         return this.vehicleRepository.create(vehicleCarryWeight, vehicleServiceInterval, vehicleKilometers, vehicleLastService,
-                vehicleLastServiceKm, vehiclePlate, vehicleVIN, vehicleRegDate, warehouse.getWarehouseId(), driver.getUserId());
+                vehicleLastServiceKm, vehiclePlate, vehicleVIN, vehicleRegDate, warehouse.getWarehouseId());
     }
 
@@ -42,9 +41,9 @@
     public Optional<Vehicle> updateVehicle(Integer id, Integer vehicleCarryWeight, Short vehicleServiceInterval, Integer vehicleKilometers,
                                            LocalDate vehicleLastService, Integer vehicleLastServiceKm, String vehiclePlate, String vehicleVIN,
-                                           LocalDate vehicleRegDate, Warehouse warehouse, Driver driver) {
+                                           LocalDate vehicleRegDate, Warehouse warehouse) {
 
 
         return this.vehicleRepository.edit(id, vehicleCarryWeight, vehicleServiceInterval, vehicleKilometers, vehicleLastService, vehicleLastServiceKm,
-                vehiclePlate, vehicleVIN, vehicleRegDate, warehouse.getWarehouseId(), driver.getUserId());
+                vehiclePlate, vehicleVIN, vehicleRegDate, warehouse.getWarehouseId());
     }
 
Index: backend/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 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/controller/CustomerController.java	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -19,5 +19,5 @@
 
     @GetMapping("/all")
-    public ResponseEntity<List<Customer>> getAllCustomers(){
+    public ResponseEntity<List<Customer>> getAllCustomers() {
         List<Customer> customers = this.customerService.findAllCustomers();
         return ResponseEntity.ok(customers);
@@ -25,5 +25,5 @@
 
     @GetMapping("/find/{id}")
-    public ResponseEntity<Customer> getCustomer(@PathVariable Long id){
+    public ResponseEntity<Customer> getCustomer(@PathVariable Long id) {
         Customer c = this.customerService.findCustomerById(id).get();
         return ResponseEntity.ok(c);
@@ -63,5 +63,5 @@
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<Customer> deleteCustomer(@PathVariable Long id){
+    public ResponseEntity<Customer> deleteCustomer(@PathVariable Long id) {
         this.customerService.delete(id);
         return ResponseEntity.noContent().build();
Index: backend/src/main/resources/application.properties
===================================================================
--- backend/src/main/resources/application.properties	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ backend/src/main/resources/application.properties	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,14 +1,21 @@
 spring.application.name=DistributorApp
+# PostgreSQL
 # PostgreSQL
 spring.datasource.url=jdbc:postgresql://localhost:5432/distributor_app
 spring.datasource.username=postgres
 spring.datasource.password=b17i19
-spring.datasource.hikari.connection-timeout=20000
-spring.datasource.hikari.maximum-pool-size=5
+
+spring.datasource.hikari.connectionTimeout=20000
+spring.datasource.hikari.maximumPoolSize=5
+
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+
+#spring.jpa.hibernate.ddl-auto=validate
+spring.jpa.show-sql=true
+
+spring.datasource.hikari.schema=IND0_185022
+
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.data.jdbc.dialect=postgresql
-spring.jpa.show-sql=true
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.properties.hibernate.format_sql=true
 
 # Email properties / smtp mail properties
Index: distributor-app-frontend/angular.json
===================================================================
--- distributor-app-frontend/angular.json	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ distributor-app-frontend/angular.json	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -56,5 +56,11 @@
               "optimization": false,
               "extractLicenses": false,
-              "sourceMap": true
+              "sourceMap": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.development.ts"
+                }
+              ]
             }
           },
Index: distributor-app-frontend/src/app/app.component.html
===================================================================
--- distributor-app-frontend/src/app/app.component.html	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ distributor-app-frontend/src/app/app.component.html	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,3 +1,7 @@
-<div *ngFor="let customer of customers">
-  <div>{{ customer }}</div>
+<div>
+  @for (customer of customers; track customer.userId) {
+  <div>
+    {{ customer.userName }}
+  </div>
+  }
 </div>
Index: distributor-app-frontend/src/app/app.component.ts
===================================================================
--- distributor-app-frontend/src/app/app.component.ts	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ distributor-app-frontend/src/app/app.component.ts	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,3 +1,3 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
 import { CustomerModel } from './models/customer.model';
@@ -7,5 +7,6 @@
 @Component({
   selector: 'app-root',
-  imports: [RouterOutlet],
+  // imports: [RouterOutlet],
+  imports: [],
   templateUrl: './app.component.html',
   styleUrl: './app.component.css',
@@ -16,5 +17,9 @@
   public customers: CustomerModel[] = [];
 
-  constructor(private customerService: CustomerService) {}
+  constructor() {}
+
+  // constructor(customerService: CustomerService){}
+
+  private customerService = Inject(CustomerService);
 
   ngOnInit(): void {
Index: distributor-app-frontend/src/app/app.config.ts
===================================================================
--- distributor-app-frontend/src/app/app.config.ts	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ distributor-app-frontend/src/app/app.config.ts	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -3,7 +3,16 @@
 
 import { routes } from './app.routes';
-import { provideClientHydration, withEventReplay } from '@angular/platform-browser';
+import {
+  provideClientHydration,
+  withEventReplay,
+} from '@angular/platform-browser';
+import { provideHttpClient } from '@angular/common/http';
 
 export const appConfig: ApplicationConfig = {
-  providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideRouter(routes), provideClientHydration(withEventReplay())]
+  providers: [
+    provideZoneChangeDetection({ eventCoalescing: true }),
+    provideRouter(routes),
+    provideClientHydration(withEventReplay()),
+    provideHttpClient(),
+  ],
 };
Index: distributor-app-frontend/src/app/components/home/home.component.ts
===================================================================
--- distributor-app-frontend/src/app/components/home/home.component.ts	(revision 43b4ac7f24850aafd7ccd6b0bbb6672b3ecb7b3a)
+++ distributor-app-frontend/src/app/components/home/home.component.ts	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -1,3 +1,4 @@
 import { Component } from '@angular/core';
+import { NavbarComponent } from '../navbar/navbar.component';
 
 @Component({
@@ -5,7 +6,5 @@
   imports: [],
   templateUrl: './home.component.html',
-  styleUrl: './home.component.css'
+  styleUrl: './home.component.css',
 })
-export class HomeComponent {
-
-}
+export class HomeComponent {}
Index: distributor-app-frontend/src/environments/environment.development.ts
===================================================================
--- distributor-app-frontend/src/environments/environment.development.ts	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
+++ distributor-app-frontend/src/environments/environment.development.ts	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -0,0 +1,1 @@
+export const environment = {};
Index: distributor-app-frontend/src/environments/environment.ts
===================================================================
--- distributor-app-frontend/src/environments/environment.ts	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
+++ distributor-app-frontend/src/environments/environment.ts	(revision 350a18d4c3b60a15865626a076ee70485f87399b)
@@ -0,0 +1,3 @@
+export const environment = {
+  production: true,
+};