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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CategoryService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -15,7 +15,7 @@
     Integer create(CategoryDto categoryDto);
 
-    Integer update(CategoryDto categoryDto);
+    Integer edit(CategoryDto categoryDto);
 
-    void delete(Long id);
+    void deleteById(Long id);
 
     List<CategoryDto> searchCategories(String text);
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CityService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -2,6 +2,8 @@
 
 import mk.ukim.finki.db.distributorapp.model.dto.CityDto;
+import mk.ukim.finki.db.distributorapp.model.entities.City;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface CityService {
@@ -11,9 +13,11 @@
     CityDto getCityById(Long id);
 
+    Optional<City> getCityObjById(Long id);
+
     Integer create(CityDto cityDto);
 
     Integer edit(CityDto cityDto);
 
-    void delete(Long id);
+    void deleteById(Long id);
 
     List<CityDto> searchCities(String text);
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerService.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -17,4 +17,4 @@
     Integer edit(CustomerDto customerDto);
 
-    void delete(Long id);
+    void deleteById(Long id);
 }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -20,4 +20,4 @@
     Integer edit(DeliveryDto deliveryDto);
 
-    void delete(Long del_id);
+    void deleteById(Long del_id);
 }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryStatusService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -6,5 +6,6 @@
 
 public interface DeliveryStatusService {
-    List<DeliveryStatusDto> listDeliveryStatus();
+
+    List<DeliveryStatusDto> getAllDeliveryStatus();
 
     DeliveryStatusDto getDeliveryStatusById(Short id);
@@ -16,4 +17,4 @@
     List<DeliveryStatusDto> getDeliveryStatusByName(String name);
 
-    void delete(Short id);
+    void deleteById(Short id);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -16,4 +16,4 @@
     Integer edit(DriverDto driverDto);
 
-    void delete(Long id);
+    void deleteById(Long id);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManagerService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManagerService.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManagerService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -14,5 +14,5 @@
     Integer edit(ManagerDto managerDto);
 
-    void deleteManagerById(Long id);
+    void deleteById(Long id);
 
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManufacturerService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManufacturerService.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManufacturerService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -16,4 +16,4 @@
     Integer edit(ManufacturerDto manufacturerDto);
 
-    void delete(Long id);
+    void deleteById(Long id);
 }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrderStatusService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -6,5 +6,5 @@
 
 public interface OrderStatusService {
-    List<OrderStatusDto> listOrderStatus();
+    List<OrderStatusDto> getAllOrderStatus();
 
     OrderStatusDto  getOrderStatusById(Short id);
@@ -16,4 +16,4 @@
     List<OrderStatusDto> getOrderStatusByName(String name);
 
-    void delete(Short id);
+    void deleteById(Short id);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/PriceService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/PriceService.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/PriceService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -15,5 +15,5 @@
     Integer edit(PriceDto priceDto);
 
-    void delete(Integer id);
+    void deleteById(Integer id);
 
 }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -6,5 +6,5 @@
 
 public interface ProFormaService {
-    List<ProFormaDto> getAllPro_Forma();
+    List<ProFormaDto> getAllProForma();
 
     ProFormaDto findProFormaById(Long id);
@@ -14,5 +14,5 @@
     Integer edit(ProFormaDto proFormaDto);
 
-    void delete(Long id);
+    void deleteById(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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaStatusService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -6,5 +6,5 @@
 
 public interface ProFormaStatusService {
-    List<ProFormaStatusDto> listProFormaStatus();
+    List<ProFormaStatusDto> getAllProFormaStatus();
 
     ProFormaStatusDto getProFormaStatusById(Short id);
@@ -16,4 +16,4 @@
     List<ProFormaStatusDto> getProFormaStatusByName(String name);
 
-    void delete(Short id);
+    void deleteById(Short id);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/RegionService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/RegionService.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/RegionService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -7,5 +7,5 @@
 public interface RegionService {
 
-    List<RegionDto> listRegions();
+    List<RegionDto> getAllRegions();
 
     RegionDto getRegionById(Integer id);
@@ -17,4 +17,4 @@
     Integer edit(RegionDto regionDto);
 
-    void delete(Integer id);
+    void deleteById(Integer id);
 }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/VehicleService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -16,4 +16,4 @@
     Integer edit(VehicleDto vehicleDto);
 
-    void deleteVehicleById(Integer id);
+    void deleteById(Integer id);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WarehouseService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WarehouseService.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WarehouseService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -7,5 +7,5 @@
 
 public interface WarehouseService {
-    List<WarehouseDto> findAll();
+    List<WarehouseDto> getAllWarehouses();
 
     List<WarehouseDto> findAllByCity(City city);
@@ -17,4 +17,4 @@
     Integer edit(WarehouseDto warehouseDto);
 
-    void delete(Integer id);
+    void deleteById(Integer id);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WeekdayService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WeekdayService.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WeekdayService.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -16,4 +16,4 @@
     Integer edit(WeekdayDto weekdayDto);
 
-    void delete(Short id);
+    void deleteById(Short id);
 }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CategoryServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -53,10 +53,10 @@
 
     @Override
-    public Integer update(CategoryDto categoryDto) {
+    public Integer edit(CategoryDto categoryDto) {
         return this.categoryRepository.edit(categoryDto.getId(), categoryDto.getName());
     }
 
     @Override
-    public void delete(Long id) {
+    public void deleteById(Long id) {
         this.categoryRepository.deleteById(id);
     }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CityServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -9,4 +9,5 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Service
@@ -51,4 +52,9 @@
 
     @Override
+    public Optional<City> getCityObjById(Long id){
+        return this.cityRepository.findById(id);
+    }
+
+    @Override
     public Integer create(CityDto dto) {
         return this.cityRepository.create(dto.getName(), dto.getRegionId());
@@ -61,5 +67,5 @@
 
     @Override
-    public void delete(Long id) {
+    public void deleteById(Long id) {
         this.cityRepository.deleteById(id);
     }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerServiceImpl.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -93,5 +93,5 @@
 
     @Override
-    public void delete(Long id) {
+    public void deleteById(Long id) {
         this.customerRepository.delete(id);
     }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -115,5 +115,5 @@
 
     @Override
-    public void delete(Long del_id) {
+    public void deleteById(Long del_id) {
         this.deliveryRepository.delete(del_id);
     }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryStatusServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -32,6 +32,6 @@
 
     @Override
-    public List<DeliveryStatusDto> listDeliveryStatus() {
-        List<DeliveryStatus> deliveryStatuses = this.deliveryStatusRepository.findAll();
+    public List<DeliveryStatusDto> getAllDeliveryStatus() {
+        List<DeliveryStatus> deliveryStatuses = this.deliveryStatusRepository.listAll();
         return buildDto(deliveryStatuses);
     }
@@ -69,5 +69,5 @@
 
     @Override
-    public void delete(Short id) {
+    public void deleteById(Short id) {
         this.deliveryStatusRepository.delete(id);
     }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -75,5 +75,5 @@
 
     @Override
-    public void delete(Long id) {
+    public void deleteById(Long id) {
         this.driverRepository.deleteById(id);
     }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManagerServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManagerServiceImpl.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManagerServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -73,5 +73,5 @@
 
     @Override
-    public void deleteManagerById(Long id) {
+    public void deleteById(Long id) {
         this.managerRepository.delete(id);
     }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManufacturerServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManufacturerServiceImpl.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManufacturerServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -77,5 +77,5 @@
 
     @Override
-    public void delete(Long id) {
+    public void deleteById(Long id) {
 
     }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrderStatusServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -32,5 +32,5 @@
 
     @Override
-    public List<OrderStatusDto> listOrderStatus() {
+    public List<OrderStatusDto> getAllOrderStatus() {
         List<OrderStatus> orderStatuses = this.orderStatusRepository.findAll();
         return buildDto(orderStatuses);
@@ -72,5 +72,5 @@
 
     @Override
-    public void delete(Short id) {
+    public void deleteById(Short id) {
         this.orderStatusRepository.deleteById(id);
     }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/PriceServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/PriceServiceImpl.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/PriceServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -66,5 +66,5 @@
 
     @Override
-    public void delete(Integer id) {
+    public void deleteById(Integer id) {
         this.priceRepository.delete(id);
     }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -39,5 +39,5 @@
 
     @Override
-    public List<ProFormaDto> getAllPro_Forma() {
+    public List<ProFormaDto> getAllProForma() {
         List<ProForma> proFormas = this.proFormaRepository.listAll();
         return buildDto(proFormas);
@@ -81,5 +81,5 @@
 
     @Override
-    public void delete(Long id) {
+    public void deleteById(Long id) {
         this.proFormaRepository.deleteById(id);
     }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaStatusServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -32,5 +32,5 @@
 
     @Override
-    public List<ProFormaStatusDto> listProFormaStatus() {
+    public List<ProFormaStatusDto> getAllProFormaStatus() {
         List<ProFormaStatus> proFormaStatuses = this.proFormaStatusRepository.findAll();
         return buildDto(proFormaStatuses);
@@ -71,5 +71,5 @@
 
     @Override
-    public void delete(Short id) {
+    public void deleteById(Short id) {
         this.proFormaStatusRepository.deleteById(id);
     }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/RegionServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/RegionServiceImpl.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/RegionServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -32,5 +32,5 @@
 
     @Override
-    public List<RegionDto> listRegions() {
+    public List<RegionDto> getAllRegions() {
         List<Region> regions = this.regionRepository.listAll();
         return buildDto(regions);
@@ -68,5 +68,5 @@
 
     @Override
-    public void delete(Integer id) {
+    public void deleteById(Integer id) {
         this.regionRepository.deleteById(id);
     }
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 d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -94,5 +94,5 @@
 
     @Override
-    public void deleteVehicleById(Integer id) {
+    public void deleteById(Integer id) {
         this.vehicleRepository.delete(id);
     }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -36,5 +36,5 @@
 
     @Override
-    public List<WarehouseDto> findAll() {
+    public List<WarehouseDto> getAllWarehouses() {
         List<Warehouse> warehouses = this.warehouseRepository.findAll();
         return buildDtoList(warehouses);
@@ -78,5 +78,5 @@
 
     @Override
-    public void delete(Integer id) {
+    public void deleteById(Integer id) {
         this.warehouseRepository.findById(id);
     }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WeekdayServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WeekdayServiceImpl.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WeekdayServiceImpl.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -5,8 +5,10 @@
 import mk.ukim.finki.db.distributorapp.repository.WeekdayRepository;
 import mk.ukim.finki.db.distributorapp.service.WeekdayService;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Service
 public class WeekdayServiceImpl implements WeekdayService {
     private final WeekdayRepository weekdayRepository;
@@ -68,5 +70,5 @@
 
     @Override
-    public void delete(Short id) {
+    public void deleteById(Short id) {
         this.weekdayRepository.deleteById(id);
     }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.ArticleDto;
 import mk.ukim.finki.db.distributorapp.service.ArticleService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -28,5 +27,5 @@
         Integer res = this.articleService.create(articleDto);
 
-        return new ResponseEntity<>(res, HttpStatus.OK);
+        return ResponseEntity.ok(res);
     }
 
@@ -34,6 +33,5 @@
     ResponseEntity<Integer> editArticle(@RequestBody ArticleDto articleDto) {
         Integer res = this.articleService.editById(articleDto);
-        return new ResponseEntity<>(res, HttpStatus.OK);
-    }
+        return ResponseEntity.ok(res);    }
 
 
@@ -41,5 +39,5 @@
     public ResponseEntity<Void> deleteArticle(@PathVariable Long id) {
         this.articleService.deleteById(id);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleUnitController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleUnitController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ArticleUnitController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.ArticleUnitDto;
 import mk.ukim.finki.db.distributorapp.service.ArticleUnitService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,19 +19,18 @@
     @GetMapping("/all")
     public ResponseEntity<List<ArticleUnitDto>> getAllUnits() {
-        //List<ArticleUnit> units = this.articleUnitService.getAllArticleUnits();
-
-        //return ResponseEntity.ok(units);
-
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<ArticleUnitDto> units = this.articleUnitService.getAllArticleUnits();
+        return ResponseEntity.ok(units);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<ArticleUnitDto> addUnit(@RequestBody ArticleUnitDto articleUnitDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addUnit(@RequestBody ArticleUnitDto articleUnitDto) {
+        Integer result = this.articleUnitService.create(articleUnitDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("edit")
-    public ResponseEntity<ArticleUnitDto> editUnit(@RequestBody ArticleUnitDto articleUnitDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editUnit(@RequestBody ArticleUnitDto articleUnitDto) {
+        Integer result = this.articleUnitService.edit(articleUnitDto);
+        return ResponseEntity.ok(result);
     }
 
@@ -40,5 +38,5 @@
     public ResponseEntity<Void> deleteUnit(@PathVariable Long id) {
         this.articleUnitService.delete(id);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CategoryController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CategoryController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CategoryController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -4,7 +4,5 @@
 import mk.ukim.finki.db.distributorapp.service.CategoryService;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -19,5 +17,4 @@
     }
 
-
     @GetMapping("/all")
     public ResponseEntity<List<CategoryDto>> getAllCategoriesDto() {
@@ -25,3 +22,21 @@
         return ResponseEntity.ok(categoryDtos);
     }
+
+    @PutMapping("/add")
+    public ResponseEntity<Integer> addCategory(@RequestBody CategoryDto categoryDto) {
+        Integer result = this.categoryService.create(categoryDto);
+        return ResponseEntity.ok(result);
+    }
+
+    @PutMapping("edit")
+    public ResponseEntity<Integer> editCategory(@RequestBody CategoryDto categoryDto) {
+        Integer result = this.categoryService.edit(categoryDto);
+        return ResponseEntity.ok(result);
+    }
+
+    @DeleteMapping("/delete/{id}")
+    public ResponseEntity<Void> deleteCategory(@PathVariable Long id) {
+        this.categoryService.deleteById(id);
+        return ResponseEntity.noContent().build();
+    }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CityController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CityController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CityController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -20,19 +20,23 @@
     @GetMapping("/all")
     public ResponseEntity<List<CityDto>> getAllCities() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<CityDto> cities = this.cityService.listCities();
+        return ResponseEntity.ok(cities);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<CityDto> addCity(@RequestBody CityDto CityDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addCity(@RequestBody CityDto CityDto) {
+        Integer result = this.cityService.create(CityDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<CityDto> editCity(@RequestBody CityDto CityDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editCity(@RequestBody CityDto CityDto) {
+        Integer result = this.cityService.edit(CityDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<CityDto> deleteCity(@PathVariable Long id) {
+    public ResponseEntity<Void> deleteCity(@PathVariable Long id) {
+        this.cityService.deleteById(id);
         return new ResponseEntity<>(HttpStatus.OK);
     }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.CustomerDto;
 import mk.ukim.finki.db.distributorapp.service.CustomerService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -21,20 +20,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<CustomerDto>> getAllCustomers() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<CustomerDto> result = customerService.findAllCustomers();
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<CustomerDto> addCustomer(@RequestBody CustomerDto customerDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addCustomer(@RequestBody CustomerDto customerDto) {
+        Integer result = this.customerService.create(customerDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<CustomerDto> editCustomer(@RequestBody CustomerDto customerDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editCustomer(@RequestBody CustomerDto customerDto) {
+        Integer result = this.customerService.edit(customerDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<CustomerDto> deleteCustomer(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteCustomer(@PathVariable Long id) {
+        this.customerService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DeliveryController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DeliveryController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DeliveryController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto;
 import mk.ukim.finki.db.distributorapp.service.DeliveryService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,20 +19,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<DeliveryDto>> getAllDeliveries() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<DeliveryDto> deliveries = deliveryService.getAllDeliveries();
+        return ResponseEntity.ok(deliveries);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<DeliveryDto> addDelivery(@RequestBody DeliveryDto DeliveryDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addDelivery(@RequestBody DeliveryDto DeliveryDto) {
+        Integer result = this.deliveryService.create(DeliveryDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<DeliveryDto> editDelivery(@RequestBody DeliveryDto DeliveryDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editDelivery(@RequestBody DeliveryDto DeliveryDto) {
+        Integer result = this.deliveryService.edit(DeliveryDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<DeliveryDto> deleteDelivery(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteDelivery(@PathVariable Long id) {
+        this.deliveryService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DeliveryStatusController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DeliveryStatusController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DeliveryStatusController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.DeliveryStatusDto;
 import mk.ukim.finki.db.distributorapp.service.DeliveryStatusService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,20 +19,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<DeliveryStatusDto>> getAllDeliveryStatus() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<DeliveryStatusDto> statuses = this.deliveryStatusService.getAllDeliveryStatus();
+        return ResponseEntity.ok(statuses);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<DeliveryStatusDto> addDeliveryStatus(@RequestBody DeliveryStatusDto DeliveryStatusDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addDeliveryStatus(@RequestBody DeliveryStatusDto DeliveryStatusDto) {
+        Integer result = this.deliveryStatusService.create(DeliveryStatusDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<DeliveryStatusDto> editDeliveryStatus(@RequestBody DeliveryStatusDto DeliveryStatusDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editDeliveryStatus(@RequestBody DeliveryStatusDto DeliveryStatusDto) {
+        Integer result = this.deliveryStatusService.edit(DeliveryStatusDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<DeliveryStatusDto> deleteDeliveryStatus(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteDeliveryStatus(@PathVariable Short id) {
+        this.deliveryStatusService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -2,5 +2,5 @@
 
 import mk.ukim.finki.db.distributorapp.model.dto.DriverDto;
-import org.springframework.http.HttpStatus;
+import mk.ukim.finki.db.distributorapp.service.DriverService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -11,23 +11,32 @@
 @RequestMapping("/driver")
 public class DriverController {
+    private final DriverService driverService;
+
+    public DriverController(DriverService driverService) {
+        this.driverService = driverService;
+    }
 
     @GetMapping("/all")
     public ResponseEntity<List<DriverDto>> getAllDrivers() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<DriverDto> drivers = driverService.getAllDrivers();
+        return ResponseEntity.ok(drivers);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<DriverDto> addDriver(@RequestBody DriverDto driverDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addDriver(@RequestBody DriverDto driverDto) {
+        Integer result = this.driverService.create(driverDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<DriverDto> editDriver(@RequestBody DriverDto driverDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editDriver(@RequestBody DriverDto driverDto) {
+        Integer result = this.driverService.edit(driverDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<DriverDto> deleteDriver(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteDriver(@PathVariable Long id) {
+        this.driverService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -2,5 +2,5 @@
 
 import mk.ukim.finki.db.distributorapp.model.dto.ManagerDto;
-import org.springframework.http.HttpStatus;
+import mk.ukim.finki.db.distributorapp.service.ManagerService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -12,23 +12,32 @@
 @RequestMapping("/manager")
 public class ManagerController {
+    private final ManagerService managerService;
+
+    public ManagerController(ManagerService managerService) {
+        this.managerService = managerService;
+    }
 
     @GetMapping("/all")
     public ResponseEntity<List<ManagerDto>> getAllManagers() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<ManagerDto> managers = managerService.getAllManagers();
+        return ResponseEntity.ok(managers);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<ManagerDto> addManager(@RequestBody ManagerDto ManagerDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addManager(@RequestBody ManagerDto ManagerDto) {
+        Integer result = this.managerService.create(ManagerDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<ManagerDto> editManager(@RequestBody ManagerDto ManagerDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editManager(@RequestBody ManagerDto ManagerDto) {
+        Integer result = this.managerService.edit(ManagerDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<ManagerDto> deleteManager(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteManager(@PathVariable Long id) {
+        this.managerService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManufacturerController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManufacturerController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManufacturerController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.ManufacturerDto;
 import mk.ukim.finki.db.distributorapp.service.ManufacturerService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,20 +19,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<ManufacturerDto>> getAllManufacturers() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<ManufacturerDto> manufacturers = manufacturerService.getAllManufacturers();
+        return ResponseEntity.ok(manufacturers);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<ManufacturerDto> addManufacturer(@RequestBody ManufacturerDto ManufacturerDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addManufacturer(@RequestBody ManufacturerDto ManufacturerDto) {
+        Integer result = this.manufacturerService.create(ManufacturerDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<ManufacturerDto> editManufacturer(@RequestBody ManufacturerDto ManufacturerDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editManufacturer(@RequestBody ManufacturerDto ManufacturerDto) {
+        Integer result = this.manufacturerService.edit(ManufacturerDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<ManufacturerDto> deleteManufacturer(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteManufacturer(@PathVariable Long id) {
+        this.manufacturerService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/OrderStatusController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/OrderStatusController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/OrderStatusController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.OrderStatusDto;
 import mk.ukim.finki.db.distributorapp.service.OrderStatusService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,20 +19,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<OrderStatusDto>> getAllOrderStatus() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<OrderStatusDto> statuses = this.orderStatusService.getAllOrderStatus();
+        return ResponseEntity.ok(statuses);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<OrderStatusDto> addOrderStatus(@RequestBody OrderStatusDto OrderStatusDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addOrderStatus(@RequestBody OrderStatusDto OrderStatusDto) {
+        Integer result = this.orderStatusService.create(OrderStatusDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<OrderStatusDto> editOrderStatus(@RequestBody OrderStatusDto OrderStatusDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editOrderStatus(@RequestBody OrderStatusDto OrderStatusDto) {
+        Integer result = this.orderStatusService.edit(OrderStatusDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<OrderStatusDto> deleteOrderStatus(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteOrderStatus(@PathVariable Short id) {
+        this.orderStatusService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/OrdersController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/OrdersController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/OrdersController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.OrdersDto;
 import mk.ukim.finki.db.distributorapp.service.OrdersService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -21,20 +20,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<OrdersDto>> getAllOrders() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<OrdersDto> orders = OrderService.getAllOrders();
+        return ResponseEntity.ok(orders);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<OrdersDto> addOrders(@RequestBody OrdersDto OrdersDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addOrders(@RequestBody OrdersDto OrdersDto) {
+        Integer result = this.OrderService.create(OrdersDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<OrdersDto> editOrders(@RequestBody OrdersDto OrdersDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editOrders(@RequestBody OrdersDto OrdersDto) {
+        Integer result =this.OrderService.edit(OrdersDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<OrdersDto> deleteOrders(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteOrders(@PathVariable Long id) {
+        this.OrderService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/PriceController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/PriceController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/PriceController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.PriceDto;
 import mk.ukim.finki.db.distributorapp.service.PriceService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,20 +19,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<PriceDto>> getAllPrices() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<PriceDto> prices = this.priceService.getAllPrices();
+        return ResponseEntity.ok(prices);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<PriceDto> addPrice(@RequestBody PriceDto PriceDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addPrice(@RequestBody PriceDto PriceDto) {
+        Integer result = this.priceService.create(PriceDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<PriceDto> editPrice(@RequestBody PriceDto PriceDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editPrice(@RequestBody PriceDto PriceDto) {
+        Integer result = this.priceService.edit(PriceDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<PriceDto> deletePrice(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deletePrice(@PathVariable Integer id) {
+        this.priceService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ProFormaController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ProFormaController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ProFormaController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.ProFormaDto;
 import mk.ukim.finki.db.distributorapp.service.ProFormaService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,20 +19,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<ProFormaDto>> getAllProFormas() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<ProFormaDto> proFormas = this.proFormaService.getAllProForma();
+        return ResponseEntity.ok(proFormas);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<ProFormaDto> addProForma(@RequestBody ProFormaDto ProFormaDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addProForma(@RequestBody ProFormaDto ProFormaDto) {
+        Integer result = this.proFormaService.create(ProFormaDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<ProFormaDto> editProForma(@RequestBody ProFormaDto ProFormaDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editProForma(@RequestBody ProFormaDto ProFormaDto) {
+        Integer result = this.proFormaService.edit(ProFormaDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<ProFormaDto> deleteProForma(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteProForma(@PathVariable Long id) {
+        this.proFormaService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ProFormaStatusController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ProFormaStatusController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ProFormaStatusController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.ProFormaStatusDto;
 import mk.ukim.finki.db.distributorapp.service.ProFormaStatusService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,20 +19,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<ProFormaStatusDto>> getAllProFormaStatuss() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<ProFormaStatusDto> statuses = proFormaStatusService.getAllProFormaStatus();
+        return ResponseEntity.ok(statuses);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<ProFormaStatusDto> addProFormaStatus(@RequestBody ProFormaStatusDto ProFormaStatusDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addProFormaStatus(@RequestBody ProFormaStatusDto ProFormaStatusDto) {
+        Integer result = this.proFormaStatusService.create(ProFormaStatusDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<ProFormaStatusDto> editProFormaStatus(@RequestBody ProFormaStatusDto ProFormaStatusDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editProFormaStatus(@RequestBody ProFormaStatusDto ProFormaStatusDto) {
+        Integer result = this.proFormaStatusService.edit(ProFormaStatusDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<ProFormaStatusDto> deleteProFormaStatus(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteProFormaStatus(@PathVariable Short id) {
+        this.proFormaStatusService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/RegionController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/RegionController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/RegionController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.RegionDto;
 import mk.ukim.finki.db.distributorapp.service.RegionService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,20 +19,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<RegionDto>> getAllRegions() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<RegionDto> regions = this.regionService.getAllRegions();
+        return ResponseEntity.ok(regions);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<RegionDto> addRegion(@RequestBody RegionDto RegionDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addRegion(@RequestBody RegionDto RegionDto) {
+        Integer result = this.regionService.create(RegionDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<RegionDto> editRegion(@RequestBody RegionDto RegionDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editRegion(@RequestBody RegionDto RegionDto) {
+        Integer result = this.regionService.edit(RegionDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<RegionDto> deleteRegion(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteRegion(@PathVariable Integer id) {
+        this.regionService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/RegisterController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/RegisterController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/RegisterController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -46,5 +46,5 @@
     ) {
         try {
-            City selectedCity = this.cityService.getCityById(city);
+            City selectedCity = this.cityService.getCityObjById(city).get();
             this.usersService.register(name, surname, email, password, repeatedPassword, mobile, selectedCity);
             return "redirect:/login";
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/VehicleController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/VehicleController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/VehicleController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.VehicleDto;
 import mk.ukim.finki.db.distributorapp.service.VehicleService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,20 +19,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<VehicleDto>> getAllVehicles() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<VehicleDto> vehicles = vehicleService.getAllVehicles();
+        return ResponseEntity.ok(vehicles);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<VehicleDto> addVehicle(@RequestBody VehicleDto VehicleDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addVehicle(@RequestBody VehicleDto VehicleDto) {
+        Integer result = this.vehicleService.create(VehicleDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<VehicleDto> editVehicle(@RequestBody VehicleDto VehicleDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editVehicle(@RequestBody VehicleDto VehicleDto) {
+        Integer result = this.vehicleService.edit(VehicleDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<VehicleDto> deleteVehicle(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteVehicle(@PathVariable Integer id) {
+        this.vehicleService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/WarehouseController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/WarehouseController.java	(revision d320251587e749126899e26b6df87cd838037c0d)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/WarehouseController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.WarehouseDto;
 import mk.ukim.finki.db.distributorapp.service.WarehouseService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,20 +19,24 @@
     @GetMapping("/all")
     public ResponseEntity<List<WarehouseDto>> getAllWarehouses() {
-        return new ResponseEntity<>(HttpStatus.OK);
+        List<WarehouseDto> warehouses = this.warehouseService.getAllWarehouses();
+        return ResponseEntity.ok(warehouses);
     }
 
     @PutMapping("/add")
-    public ResponseEntity<WarehouseDto> addWarehouse(@RequestBody WarehouseDto WarehouseDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> addWarehouse(@RequestBody WarehouseDto WarehouseDto) {
+        Integer result = this.warehouseService.create(WarehouseDto);
+        return ResponseEntity.ok(result);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<WarehouseDto> editWarehouse(@RequestBody WarehouseDto WarehouseDto) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Integer> editWarehouse(@RequestBody WarehouseDto WarehouseDto) {
+        Integer result = this.warehouseService.edit(WarehouseDto);
+        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<WarehouseDto> deleteWarehouse(@PathVariable Long id) {
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<Void> deleteWarehouse(@PathVariable Integer id) {
+        this.warehouseService.deleteById(id);
+        return ResponseEntity.noContent().build();
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/WeekdayController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/WeekdayController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/WeekdayController.java	(revision aa2935819fdc9dad9171dae4c990af1f0bf5c342)
@@ -0,0 +1,42 @@
+package mk.ukim.finki.db.distributorapp.web;
+
+import mk.ukim.finki.db.distributorapp.model.dto.WeekdayDto;
+import mk.ukim.finki.db.distributorapp.service.WeekdayService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/weekday")
+public class WeekdayController {
+    private final WeekdayService weekdayService;
+
+    public WeekdayController(WeekdayService weekdayService) {
+        this.weekdayService = weekdayService;
+    }
+
+    @GetMapping("/all")
+    public ResponseEntity<List<WeekdayDto>> getAllWeekdays(){
+        List<WeekdayDto> weekdays = weekdayService.getAllWeekdays();
+        return ResponseEntity.ok(weekdays);
+    }
+
+    @PutMapping("/add")
+    public ResponseEntity<Integer> addWeekday(@RequestBody WeekdayDto weekdayDto){
+        Integer result = this.weekdayService.create(weekdayDto);
+        return ResponseEntity.ok(result);
+    }
+
+    @PutMapping("/edit")
+    public ResponseEntity<Integer> editWeekday(@RequestBody WeekdayDto weekdayDto){
+        Integer result = this.weekdayService.edit(weekdayDto);
+        return ResponseEntity.ok(result);
+    }
+
+    @DeleteMapping("/delete/{id}")
+    public ResponseEntity<Void> deleteWeekday(@PathVariable Short id){
+        this.weekdayService.deleteById(id);
+        return ResponseEntity.noContent().build();
+    }
+}