Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/TokenDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/TokenDto.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/TokenDto.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -0,0 +1,20 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TokenDto { + Long t_id; + String t_value; + LocalDateTime t_date; + String t_type; + LocalDateTime t_expiry; + LocalDateTime t_validated_at; + Long user_id; +} 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -11,5 +11,4 @@ import java.util.List; -import java.util.Optional; public interface ArticleRepository extends JpaRepository { @@ -35,20 +34,4 @@ ) List listAll(); - - @Query( - nativeQuery = true, - value = "select * " + - "from article a " + - "where a.art_name like ?1" - ) - List
findAllByName(@NonNull @Param("name") String name); - - @Query( - nativeQuery = true, - value = "select * " + - "from article a " + - "where a.art_id=?1" - ) - Optional
findById(@NonNull @Param("id") Long id); @Modifying 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ArticleUnitRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -14,5 +14,4 @@ import java.util.Date; import java.util.List; -import java.util.Optional; public interface ArticleUnitRepository extends JpaRepository { @@ -22,18 +21,4 @@ ) List listAll(); - - @Query( - nativeQuery = true, - value = "select * " + - "from article_unit au join article a on au.art_id = a.art_id " + - "where a.art_name like ?1" - ) - List findAllByName(@NonNull @Param("name") String name); - - @Query( - nativeQuery = true, - value = "select * from article_unit where unit_id=?1" - ) - Optional findById(@NonNull @Param("id") Long id); @Query( @@ -114,20 +99,4 @@ nativeQuery = true, value = """ - select * - from article_unit au - join warehouse wh on au.wh_id = wh.wh_id - join unit_price up on au.unit_id = up.unit_id - join price p on up.price_id = p.price_id - join article a on p.art_id = a.art_id - join manufacturer m on a.man_id = m.man_id - where wh.wh_id = :warehouse and a.art_id = :article - order by au.unit_manufacture_date; - """ - ) - List findAllByArticleAndWarehouse(@NonNull @Param("article") Long articleId, @NonNull @Param("warehouse") Integer warehouseId); - - @Query( - nativeQuery = true, - value = """ select au.unit_id as id, au.unit_expiration_date as expiryDate, 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CategoryRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -2,4 +2,5 @@ import lombok.NonNull; +import mk.ukim.finki.db.distributorapp.model.dto.CategoryDto; import mk.ukim.finki.db.distributorapp.model.entities.Category; import org.springframework.data.jpa.repository.JpaRepository; @@ -10,5 +11,4 @@ import java.util.List; -import java.util.Optional; public interface CategoryRepository extends JpaRepository { @@ -17,28 +17,10 @@ nativeQuery = true, value = """ - select * - from category c - where c.ctg_name like :name - """) - List findAllByName(@Param("name") @NonNull String name); - - @Query( - nativeQuery = true, - value = """ - select * + select ctg_id as id, + ctg_name as name from category """ ) - List listAll(); - - @Query( - nativeQuery = true, - value = """ - select * - from category c - where c.ctg_id=:id - """ - ) - Optional findById(@Param("id") @NonNull Integer id); + List listAll(); @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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CityRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -10,14 +10,6 @@ import java.util.List; -import java.util.Optional; public interface CityRepository extends JpaRepository { - - @Query( - nativeQuery = true, - value = "select c.* " + - "from city c join region r on c.region_id = r.region_id" - ) - List listAll(); @Query( @@ -29,21 +21,4 @@ ) List findAllCityDtos(); - - @Query( - nativeQuery = true, - value = "select * " + - "from city c " + - "where c.city_id = ?1" - ) - @Transactional - Optional findById(@NonNull Integer id); - - @Query( - nativeQuery = true, - value = "select * " + - "from city c " + - "where c.city_name like ?1" - ) - List findByName(@NonNull String name); @Modifying Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CustomerRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CustomerRepository.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CustomerRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -9,21 +9,5 @@ import org.springframework.transaction.annotation.Transactional; -import java.util.List; - public interface CustomerRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = "select * " + - "from customer c join users u on c.user_id = u.user_id" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * " + - "from customer c " + - "where cust_company_name like ?1" - ) - List findAllByName(@NonNull String name); @Query( Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CustomerWeekdayRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CustomerWeekdayRepository.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/CustomerWeekdayRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -1,4 +1,5 @@ package mk.ukim.finki.db.distributorapp.repository; +import lombok.NonNull; import mk.ukim.finki.db.distributorapp.model.entities.CustomerWeekday; import org.springframework.data.jpa.repository.JpaRepository; @@ -8,21 +9,6 @@ import java.time.LocalTime; -import java.util.List; public interface CustomerWeekdayRepository extends JpaRepository { - - @Query( - nativeQuery = true, - value = "select * from customer_weekday" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * " + - "from customer_weekday " + - "where cust_id=?1" - ) - List findByCustomerId(Long customerId); @Modifying @@ -60,4 +46,4 @@ value = "delete from customer_weekday where cust_day_id=?1" ) - void deleteById(Long id); + void deleteById(@NonNull 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -15,34 +15,6 @@ import java.util.Date; import java.util.List; -import java.util.Optional; public interface DeliveryRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = "select * from delivery" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * from delivery " + - "where veh_id = ?1" - ) - List findAllByVehicle(@NonNull Integer veh_id); - - @Query( - nativeQuery = true, - value = "select * from delivery where del_id = ?1" - ) - Optional findById(@NonNull Long id); - - @Query( - nativeQuery = true, - 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 = ?1" - ) - List findDeliveriesByDriver(@NonNull Long driver_id); @Modifying @@ -93,16 +65,4 @@ //------------------------------------------------------------------------------------------------------------------ - @Query( - nativeQuery = true, - value = """ - select de.* - from driver d join vehicle v on d.veh_id = v.veh_id - join delivery de on v.veh_id = de.veh_id - where d.user_id=:driver and de.d_status_id =1 - order by de.del_date desc; - """ - ) - List getNewDeliveriesByDriver(@NonNull @Param("driver") Long driver_id); - @Query( nativeQuery = true, @@ -182,5 +142,5 @@ List getDeliveriesByVehicle(Integer vehicleId); - @Query( + @Query( nativeQuery = true, value = """ 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryStatusRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -8,25 +8,5 @@ import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Optional; - public interface DeliveryStatusRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = "select * from delivery_status" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * from delivery_status where del_status_name like ?1" - ) - List findAllByName(@NonNull String name); - - @Query( - nativeQuery = true, - value = "select * from delivery_status where del_status_id=?1" - ) - Optional findById(@NonNull Short id); @Modifying @@ -34,5 +14,5 @@ @Query( nativeQuery = true, - value = "insert into delivery_status(del_status_name, del_status_desc) " + + value = "insert into delivery_status(d_status_name, d_status_desc) " + "values (?1,?2)" ) @@ -44,6 +24,6 @@ nativeQuery = true, value = "update delivery_status " + - "set del_status_name=?2,del_status_desc=?3 " + - "where del_status_id=?1" + "set d_status_name=?2,d_status_desc=?3 " + + "where d_status_id=?1" ) Integer edit(@NonNull Short id, @NonNull String name, @NonNull String description); @@ -53,6 +33,6 @@ @Query( nativeQuery = true, - value = "delete from delivery_status where del_status_id=?1" + value = "delete from delivery_status where d_status_id=?1" ) - void delete(Short id); + void delete(@NonNull Short id); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,37 +3,15 @@ import lombok.NonNull; import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto; +import mk.ukim.finki.db.distributorapp.model.dto.DriverDto; import mk.ukim.finki.db.distributorapp.model.entities.Driver; 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 DriverRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = "select * from driver d join users u on d.user_id = u.user_id" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select d.* from driver d join users u on d.user_id = u.user_id " + - "where u.user_name like ?1" - ) - List findAllByName(@NonNull String name); - - @Query( - nativeQuery = true, - value = """ - select * - from driver d join users u on d.user_id = u.user_id - where d.user_id=?1 - """ - ) - Optional findById(@NonNull Long id); - @Modifying @Transactional @@ -66,4 +44,20 @@ ) void delete(@NonNull Long id); + + @Query( + nativeQuery = true, + value = """ + select d.user_id as id, + u.user_name as name, + u.user_email as email, + u.user_mobile as phone, + u.user_image as image, + d.veh_id as vehId + from driver d + join users u on d.user_id = u.user_id + where d.user_id = :id + """ + ) + DriverDto findDriverById(@NonNull @Param("id") Long id); // ---------------Dashboard queries------------------------------------------ @@ -123,4 +117,4 @@ """ ) - List getOngoingDeliveries(Long driverId); + List getOngoingDeliveries(@NonNull Long driverId); } 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManagerRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -12,27 +12,4 @@ public interface ManagerRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = "select * from manager m join users u on m.user_id = u.user_id" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * from manager m join users u on m.user_id = u.user_id " + - "where user_name like ?1" - ) - List findAllByName(@NonNull String name); - - @Query( - nativeQuery = true, - value = """ - select * - from manager m join users u on m.user_id = u.user_id - where m.user_id=?1 - """ - ) - Optional findById(@NonNull Long id); - @Modifying @Transactional 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ManufacturerRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -10,5 +10,4 @@ import java.util.List; -import java.util.Optional; public interface ManufacturerRepository extends JpaRepository { @@ -26,16 +25,4 @@ List listAll(); - @Query( - nativeQuery = true, - value = "select * from manufacturer where man_name like ?1" - ) - List findAllByName(@NonNull String name); - - @Query( - nativeQuery = true, - value = "select * from manufacturer where man_id=?1" - ) - Optional findById(@NonNull Long id); - @Modifying @Transactional @@ -43,5 +30,5 @@ nativeQuery = true, value = """ - insert into manufacturer(man_name, man_address, man_mobile, man_email) + insert into manufacturer(man_name, man_adr, man_mobile, man_email) values (?1,?2,?3,?4) """ @@ -59,5 +46,5 @@ value = """ update manufacturer - set man_name=?2,man_address=?3,man_mobile=?4,man_email=?5 + set man_name=?2,man_adr=?3,man_mobile=?4,man_email=?5 where man_id=?1 """ 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrderStatusRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -8,31 +8,10 @@ import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Optional; - public interface OrderStatusRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = "select * from order_status" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * from order_status where ord_status_name like ?1" - ) - List findAllByName(@NonNull String name); - - @Query( - nativeQuery = true, - value = "select * from order_status where ord_status_id=?1" - ) - Optional findById(@NonNull Short id); - @Modifying @Transactional @Query( nativeQuery = true, - value = "insert into order_status(ord_status_name, ord_status_desc) " + + value = "insert into order_status(o_status_name, o_status_desc) " + "values (?1,?2)" ) @@ -44,6 +23,6 @@ nativeQuery = true, value = "update order_status " + - "set ord_status_name=?2,ord_status_desc=?3 " + - "where ord_status_id=?1" + "set o_status_name=?2,o_status_desc=?3 " + + "where o_status_id=?1" ) Integer edit(@NonNull Short id, @NonNull String name, @NonNull String description); @@ -53,5 +32,5 @@ @Query( nativeQuery = true, - value = "delete from order_status where ord_status_id=?1" + value = "delete from order_status where o_status_id=?1" ) void delete(@NonNull Short 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/PriceRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -10,26 +10,6 @@ import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; public interface PriceRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = "select * from price" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * from price where art_id=?1" - ) - List findAllByArticleId(@NonNull Long id); - - @Query( - nativeQuery = true, - value = "select * from price where price_id=?1" - ) - Optional findById(@NonNull Short id); - @Modifying @Transactional 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -36,10 +36,4 @@ List listAll(); - @Query( - nativeQuery = true, - value = "select * from pro_forma where pf_id=?1" - ) - Optional findById(@NonNull Short id); - @Modifying @Transactional 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaStatusRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -12,22 +12,4 @@ public interface ProFormaStatusRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = "select * from pro_forma_status" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * from pro_forma_status where pf_status_name like ?1" - ) - List findAllByName(@NonNull String name); - - @Query( - nativeQuery = true, - value = "select * from pro_forma_status where pf_status_id=?1" - ) - Optional findById(@NonNull Short id); - @Modifying @Transactional 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/RegionRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -10,31 +10,5 @@ import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Optional; - public interface RegionRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = "select * " + - "from region c" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * " + - "from region " + - "where region_id=?1" - ) - Optional findById(@NonNull Integer id); - - @Query( - nativeQuery = true, - value = "select * " + - "from region " + - "where region.region_name like ?1" - ) - List findByName(@NonNull String name); - @Modifying @Transactional Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/TokenRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/TokenRepository.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/TokenRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -2,16 +2,58 @@ import lombok.NonNull; +import mk.ukim.finki.db.distributorapp.model.dto.TokenDto; import mk.ukim.finki.db.distributorapp.security.Token; 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.time.LocalDateTime; public interface TokenRepository extends JpaRepository { - @Query( nativeQuery = true, - value = "select * " + - "from token " + - "where t_value=?1" + value = """ + select + from token + where t_value = ?1 + """ ) - Token findTokenByValue(@NonNull String token); + TokenDto findTokenByValue(@NonNull String token); + + @Modifying + @Transactional + @Query( + nativeQuery = true, + value = """ + insert into token(t_value, t_type, t_expiry, t_user) + values (:value, :type, :expiry, :user) + """ + ) + Integer create( + @NonNull @Param("value") String t_value, + @NonNull @Param("expiry") LocalDateTime t_expiry, + @NonNull @Param("user") Long user_id, + @NonNull @Param("type") String t_type + ); + + @Modifying + @Transactional + @Query( + nativeQuery = true, + value = """ + update token + set t_expiry = :expiry, t_user = :user, t_value = :value, t_type = :type, t_validated_at = :validated_at + where t_id = :id + """ + ) + Integer edit( + @NonNull @Param("id") Long t_id, + @NonNull @Param("value") String t_value, + @NonNull @Param("expiry") LocalDateTime t_expiry, + @NonNull @Param("user") Long user_id, + @NonNull @Param("validated_at") LocalDateTime validated_at, + @NonNull @Param("type") String t_type + ); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/UnitPriceRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/UnitPriceRepository.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/UnitPriceRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -13,20 +13,4 @@ public interface UnitPriceRepository extends JpaRepository { - - - @Query( - nativeQuery = true, - value = """ - select au.unit_id as unitId, - up.price_id as priceId - from article_unit au - join unit_price up on au.unit_id = up.unit_id - join price p on up.price_id = p.price_id - where p.art_id= ?1; - """ - ) - List findUnitPricesByArticleId(Long articleId); - - @Modifying @Transactional 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/UsersRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -11,54 +11,11 @@ import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; - public interface UsersRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = """ - select * - from users u - left join customer c on u.user_id = c.user_id - left join driver d on u.user_id = d.user_id - left join manager m on u.user_id = m.user_id - order by u.user_id - """ - ) - List listAll(); - - @Query( - nativeQuery = true, - value = """ - select * - from users u - left join customer c on u.user_id = c.user_id - left join driver d on u.user_id = d.user_id - left join manager m on u.user_id = m.user_id - where u.user_name like :name - """ - ) - List findAllByName(@NonNull @Param("name") String name); - - @Query( - nativeQuery = true, - value = """ - select * - from users u - left join customer c on u.user_id = c.user_id - left join driver d on u.user_id = d.user_id - left join manager m on u.user_id = m.user_id - where u.user_id=:id - """ - ) - Optional findById(@NonNull @Param("id") Long id); - @Modifying @Transactional @Query( nativeQuery = true, - value = "insert into users(user_name,user_surname,user_pass,user_salt,user_email,user_mobile,user_active,user_image,city_id,user_role,user_rtoken,user_rtoken_exp,clazz_) " + - "values (:name,:sur,:pass,:salt,:email,:mob,:active,:img,:cty,:role,:rtoken,:rtoken_exp,:clazz_)" + value = "insert into users(user_name,user_surname,user_pass,user_salt,user_email,user_mobile,user_active,user_image,city_id,user_role,clazz_) " + + "values (:name,:sur,:pass,:salt,:email,:mob,:active,:img,:cty,:role,:clazz_)" ) Integer create( @@ -73,6 +30,4 @@ @NonNull @Param("cty") Integer city_id, @NonNull @Param("role") String role, - @Param("rtoken") String rtoken, - @Param("rtoken_exp") LocalDateTime rtoken_exp, @NonNull @Param("clazz_") String clazz_); @@ -82,5 +37,5 @@ nativeQuery = true, value = "update users " + - "set user_name=:name,user_surname=:sur,user_pass=:pass,user_email=:email,user_mobile=:mob,user_salt=:salt,user_active=:active,user_image=:img,city_id=:cty,user_role=:role,user_rtoken=:rtoken,user_rtoken_exp=:rtoken_exp,clazz_=:clazz_ " + + "set user_name=:name,user_surname=:sur,user_pass=:pass,user_email=:email,user_mobile=:mob,user_salt=:salt,user_active=:active,user_image=:img,city_id=:cty,user_role=:role,clazz_=:clazz_ " + "where user_id=:id" ) @@ -106,48 +61,4 @@ ) void delete(@NonNull @Param("id") Long id); - - //////////////////////////////////////////////// - // TODO: Update the queries bellow. - @Query( - nativeQuery = true, - value = """ - select * - from users u - left join customer c on u.user_id = c.user_id - left join driver d on u.user_id = d.user_id - left join manager m on u.user_id = m.user_id - where user_email like :email - """ - ) - Optional findUserByUserEmailIgnoreCase(@NonNull @Param("email") String email); - - @Query( - nativeQuery = true, - value = """ - select * - from users - where user_email:email and user_pass=:pass - """ - ) - Optional findUserByUserNameAndUserPassword( - @NonNull @Param("pass") String password, - @NonNull @Param("email") String email); - - @Query( - nativeQuery = true, - value = "select * from users where user_email=:email" - ) - Optional findUserByUserName( - @NonNull @Param("email") String username); - - @Query( - nativeQuery = true, - value = """ - select * from users where user_rtoken=:token - """ - ) - Optional findUserByResetToken(@NonNull @Param("token") String token); - - Optional findUsersByUserEmailIgnoreCase(String email); @Query( @@ -193,3 +104,24 @@ ) UserDto findUserDtoByEmail(String userEmail); + + @Query( + nativeQuery = true, + value = """ + select u.user_id as userId, + u.user_name as userName, + u.user_surname as userSurname, + u.user_pass as userPassword, + u.user_email as userEmail, + u.user_mobile as userMobile, + u.user_salt as userSalt, + u.user_active as userActive, + u.user_image as userImage, + u.user_role as userRole, + u.clazz_ as clazz_ + from users u + join token t on u.user_id=t.t_user + where t.t_value = :token + """ + ) + UsersLoadingDto findUserByResetToken(@NonNull @Param("token") String token); } 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -13,19 +13,6 @@ import java.util.Date; import java.util.List; -import java.util.Optional; public interface VehicleRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = "select * from vehicle" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * from vehicle where wh_id=?1" - ) - List findAllByWarehouse(@NonNull Integer warehouseId); - @Query( nativeQuery = true, @@ -39,10 +26,4 @@ ) List findAllByWarehouseDto(@NonNull Integer warehouseId); - - @Query( - nativeQuery = true, - value = "select * from vehicle where veh_id=?1" - ) - Optional findById(@NonNull Integer id); @Modifying Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WarehouseRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WarehouseRepository.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WarehouseRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -12,25 +12,6 @@ import java.util.List; -import java.util.Optional; public interface WarehouseRepository extends JpaRepository { - @Query( - nativeQuery = true, - value = "select * from warehouse" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * from warehouse where city_id = ?1" - ) - List findAllByCity(@NonNull Integer city); - - @Query( - nativeQuery = true, - value = "select * from warehouse where wh_id = ?1" - ) - Optional findById(@NonNull Integer id); - @Modifying @Transactional @@ -89,12 +70,4 @@ nativeQuery = true, value = """ - select * from warehouse w where w.city_id = ?1 - """ - ) - Warehouse findWarehouseByCityId(Integer id); - - @Query( - nativeQuery = true, - value = """ with reg as ( select r.* Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WeekdayRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WeekdayRepository.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WeekdayRepository.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -12,28 +12,4 @@ public interface WeekdayRepository extends JpaRepository { - - @Query( - nativeQuery = true, - value = "select * " + - "from weekday" - ) - List listAll(); - - @Query( - nativeQuery = true, - value = "select * " + - "from weekday " + - "where day_id=?1" - ) - Optional findWeekdayById(@NonNull Short id); - - @Query( - nativeQuery = true, - value = "select * " + - "from weekday " + - "where day_name like ?1" - ) - Optional findWeekdayByName(@NonNull String dayName); - @Modifying @Transactional Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUserDetailsService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUserDetailsService.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUserDetailsService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,7 +3,4 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.entities.Users; -import mk.ukim.finki.db.distributorapp.repository.CustomerRepository; -import mk.ukim.finki.db.distributorapp.repository.DriverRepository; -import mk.ukim.finki.db.distributorapp.repository.ManagerRepository; import mk.ukim.finki.db.distributorapp.repository.UsersRepository; import org.springframework.security.core.userdetails.UserDetails; @@ -18,25 +15,9 @@ private final UsersRepository usersRepository; - private final CustomerRepository customerRepository; - private final ManagerRepository managerRepository; - private final DriverRepository driverRepository; @Override @Transactional public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { - return new Users(this.usersRepository.findUsersByUserEmailIgnoreCaseDto(email)); - -// if(Objects.equals(user.getClazz_(), "CUSTOMER")){ -// return this.customerRepository.findCustomerById(user.getUserId()) -// .orElseThrow(() -> new UsernameNotFoundException(email)); -// }else if(Objects.equals(user.getClazz_(), "MANAGER")){ -// return this.managerRepository.findCustomerById(user.getUserId()) -// .orElseThrow(() -> new UsernameNotFoundException(email)); -// } else if(Objects.equals(user.getClazz_(), "DRIVER")){ -// return this.driverRepository.findCustomerById(user.getUserId()) -// .orElseThrow(() -> new UsernameNotFoundException(email)); -// } -// return user; } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUsernamePasswordAuthenticationProvider.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUsernamePasswordAuthenticationProvider.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/CustomUsernamePasswordAuthenticationProvider.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -14,5 +14,4 @@ @RequiredArgsConstructor public class CustomUsernamePasswordAuthenticationProvider implements AuthenticationProvider { - private final UsersService usersService; private final CustomUserDetailsService customUserDetailsService; @@ -28,5 +27,5 @@ UserDetails userDetails = this.customUserDetailsService.loadUserByUsername(email); - String salt = this.usersService.findUserByEmail(email).getUserSalt(); + String salt = this.usersService.findFullUserDtoByEmail(email).getUserSalt(); if(!PassEncryption.verifyUserPassword(password, userDetails.getPassword(), salt)) throw new BadCredentialsException("Invalid password"); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/SuperUserAuthenticationProvider.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/SuperUserAuthenticationProvider.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/SuperUserAuthenticationProvider.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -15,5 +15,5 @@ public class SuperUserAuthenticationProvider implements AuthenticationProvider { - private static final String SUPERUSER_ENCODED_PASSWORD = "$2a$12$KC9Z0kHyu06iV4xlpKOgL.p2KH3NS9EY/N3g97nGAtC/NCpRXVgXa"; // example value + private static final String SUPERUSER_ENCODED_PASSWORD = "$2a$12$KC9Z0kHyu06iV4xlpKOgL.p2KH3NS9EY/N3g97nGAtC/NCpRXVgXa"; private final PasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthController.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -2,8 +2,5 @@ import jakarta.servlet.http.HttpServletRequest; -import mk.ukim.finki.db.distributorapp.model.dto.CityDtoRegister; -import mk.ukim.finki.db.distributorapp.model.dto.LoginRequestDto; -import mk.ukim.finki.db.distributorapp.model.dto.RegisterRequestDto; -import mk.ukim.finki.db.distributorapp.model.entities.Users; +import mk.ukim.finki.db.distributorapp.model.dto.*; import mk.ukim.finki.db.distributorapp.model.exceptions.InvalidUserCredentialsException; import mk.ukim.finki.db.distributorapp.service.CityService; @@ -14,4 +11,5 @@ import java.util.List; + @Controller @@ -38,17 +36,17 @@ public String login(@ModelAttribute LoginRequestDto loginRequest, RedirectAttributes redirectAttributes) { try{ - Users user = authService.login(loginRequest); + UsersLoadingDto user = authService.login(loginRequest); switch (user.getUserRole()){ - case ROLE_CUSTOMER -> { + case "ROLE_CUSTOMER" -> { return "redirect:/home/customer"; } - case ROLE_ADMIN -> { + case "ROLE_ADMIN" -> { return "redirect:/home/admin"; } - case ROLE_MANAGER -> { + case "ROLE_MANAGER" -> { return "redirect:/home/manager"; } - case ROLE_DRIVER -> { + case "ROLE_DRIVER" -> { return "redirect:/home/driver"; } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthService.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -1,20 +1,7 @@ package mk.ukim.finki.db.distributorapp.security.auth; -import mk.ukim.finki.db.distributorapp.model.dto.CreateDriverDto; -import mk.ukim.finki.db.distributorapp.model.dto.CreateManagerDto; -import mk.ukim.finki.db.distributorapp.model.dto.LoginRequestDto; -import mk.ukim.finki.db.distributorapp.model.dto.RegisterRequestDto; -import mk.ukim.finki.db.distributorapp.model.entities.Users; -import org.springframework.http.ResponseEntity; - -import java.util.Optional; +import mk.ukim.finki.db.distributorapp.model.dto.*; public interface AuthService { - String getUserSalt(String username); - - Optional getUserByEmail(String email); - - ResponseEntity confirmEmail(String confirmationToken); - void register(RegisterRequestDto registerRequest) throws Exception; @@ -23,4 +10,4 @@ void createDriver(CreateDriverDto createDriverDto) throws Exception; - Users login(LoginRequestDto loginRequest); + UsersLoadingDto login(LoginRequestDto loginRequest); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthServiceImpl.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/AuthServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,5 +3,4 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.*; -import mk.ukim.finki.db.distributorapp.model.entities.Users; import mk.ukim.finki.db.distributorapp.model.enumerations.Role; import mk.ukim.finki.db.distributorapp.model.enumerations.TokenType; @@ -9,9 +8,7 @@ import mk.ukim.finki.db.distributorapp.model.exceptions.InvalidUserCredentialsException; import mk.ukim.finki.db.distributorapp.repository.*; -import mk.ukim.finki.db.distributorapp.security.Token; import mk.ukim.finki.db.distributorapp.security.EmailService; import mk.ukim.finki.db.distributorapp.security.PassEncryption; import mk.ukim.finki.db.distributorapp.security.PassEncryptionPasswordEncoder; -import org.springframework.http.ResponseEntity; import org.springframework.mail.SimpleMailMessage; import org.springframework.stereotype.Service; @@ -19,5 +16,5 @@ import java.time.LocalDateTime; -import java.util.Optional; +import java.util.UUID; @Service @@ -32,31 +29,4 @@ private final ManagerRepository managerRepository; private final DriverRepository driverRepository; - - @Override - public String getUserSalt(String username) { - return usersRepository.findUserByUserName(username).get().getUserSalt(); - } - - @Override - public Optional getUserByEmail(String email) { - return this.usersRepository.findUserByUserEmailIgnoreCase(email); - } - - @Override - public ResponseEntity confirmEmail(String confirmationToken) { - Token token = this.tokenRepository.findTokenByValue(confirmationToken); - - if (token != null) { - Users user = this.usersRepository.findUserByUserEmailIgnoreCase(token.getUser().getUserEmail()).get(); - UserDto userDto = this.usersRepository.findUserDtoByEmail(token.getUser().getUserEmail()); - userDto.setUserActive(true); -// this.usersRepository.edit(userDto); - token.setTokenValidatedAt(LocalDateTime.now()); - this.tokenRepository.save(token); - return ResponseEntity.ok("Email verified successfully!"); - } - - return ResponseEntity.badRequest().body("Error: Couldn't verify email"); - } @Override @@ -77,6 +47,4 @@ registerRequest.getCity(), Role.ROLE_CUSTOMER.name(), - null, - null, "CUSTOMER"); if (res == 0) { @@ -84,8 +52,14 @@ } - Users user = this.usersRepository.findUserByUserEmailIgnoreCase(registerRequest.getEmail()).orElseThrow(InvalidUserCredentialsException::new); + UserDto user = this.usersRepository.findUserDtoByEmail(registerRequest.getEmail()); + String t_value = UUID.randomUUID().toString(); + tokenRepository.create( + t_value, + LocalDateTime.now().plusHours(1), + user.getId(), + TokenType.TOKEN_VERIFICATION.name() + ); - Token token = new Token(user, TokenType.TOKEN_VERIFICATION); - tokenRepository.save(token); + TokenDto createdToken = this .tokenRepository.findTokenByValue(t_value); SimpleMailMessage mailMessage = new SimpleMailMessage(); @@ -93,10 +67,10 @@ mailMessage.setSubject("Complete Registration!"); mailMessage.setText(("To confirm your account, please click here: " + - "https://localhost:8080/register/confirm-account?token=" + token.getTokenValue())); - System.out.println("Confirmation Token: " + token.getTokenValue()); + "https://localhost:8080/register/confirm-account?token=" + createdToken.getT_value())); + System.out.println("Confirmation Token: " + createdToken.getT_value()); emailService.sendEmail(mailMessage); this.customerRepository.create( - user.getUserId(), + user.getId(), registerRequest.getEdb(), registerRequest.getName(), @@ -122,6 +96,4 @@ createManagerDto.getCity(), Role.ROLE_MANAGER.name(), - null, - null, "MANAGER"); @@ -130,7 +102,7 @@ } - Users user = this.usersRepository.findUserByUserEmailIgnoreCase(createManagerDto.getEmail()).orElseThrow(InvalidUserCredentialsException::new); + UserDto user = this.usersRepository.findUserDtoByEmail(createManagerDto.getEmail()); this.managerRepository.create( - user.getUserId(), + user.getId(), createManagerDto.getWarehouseId() ); @@ -154,6 +126,4 @@ createDriverDto.getCity(), Role.ROLE_DRIVER.name(), - null, - null, "DRIVER"); @@ -162,7 +132,7 @@ } - Users user = this.usersRepository.findUserByUserEmailIgnoreCase(createDriverDto.getEmail()).orElseThrow(InvalidUserCredentialsException::new); + UserDto user = this.usersRepository.findUserDtoByEmail(createDriverDto.getEmail()); this.driverRepository.create( - user.getUserId(), + user.getId(), createDriverDto.getVehicle() ); @@ -171,5 +141,5 @@ @Override @Transactional - public Users login(LoginRequestDto loginRequest) { + public UsersLoadingDto login(LoginRequestDto loginRequest) { if (loginRequest.getEmail() == null || loginRequest.getEmail().isEmpty() @@ -180,11 +150,10 @@ } - Users user = this.usersRepository.findUsersByUserEmailIgnoreCase(loginRequest.getEmail()) - .orElseThrow(InvalidUserCredentialsException::new); + UsersLoadingDto user = this.usersRepository.findUsersByUserEmailIgnoreCaseDto(loginRequest.getEmail()); String secPassword = passwordEncoder .encodeWithSalt(loginRequest.getPassword(), user.getUserSalt()); - if (!secPassword.equals(user.getPassword())) { + if (!secPassword.equals(user.getUserPassword())) { throw new InvalidUserCredentialsException(); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/PasswordResetController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/PasswordResetController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/PasswordResetController.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -2,11 +2,11 @@ import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.dto.TokenDto; import mk.ukim.finki.db.distributorapp.model.dto.UserDto; -import mk.ukim.finki.db.distributorapp.model.entities.Users; +import mk.ukim.finki.db.distributorapp.model.dto.UsersLoadingDto; import mk.ukim.finki.db.distributorapp.model.enumerations.TokenType; import mk.ukim.finki.db.distributorapp.repository.TokenRepository; import mk.ukim.finki.db.distributorapp.security.EmailService; import mk.ukim.finki.db.distributorapp.security.PassEncryptionPasswordEncoder; -import mk.ukim.finki.db.distributorapp.security.Token; import mk.ukim.finki.db.distributorapp.service.UsersService; import org.springframework.mail.SimpleMailMessage; @@ -19,4 +19,5 @@ import java.time.LocalDateTime; +import java.util.UUID; @Controller @@ -38,5 +39,5 @@ public String resetPasswordRequest(@RequestParam("email") String email, Model model) { - Users user = this.usersService.findUserByEmail(email); + UsersLoadingDto user = this.usersService.findFullUserDtoByEmail(email); if(user==null){ model.addAttribute("error", "No user found with this email."); @@ -44,11 +45,17 @@ } - Token token = new Token(user, TokenType.TOKEN_RESET); - tokenRepository.save(token); + String t_value = UUID.randomUUID().toString(); + tokenRepository.create( + t_value, + LocalDateTime.now().plusHours(1), + user.getUserId(), + TokenType.TOKEN_RESET.name() + ); + TokenDto createdToken = this.tokenRepository.findTokenByValue(t_value); - UserDto dto = this.usersService.buildDto(user); + UserDto dto = this.usersService.findUserDtoByEmail(email); this.usersService.edit(dto); - String resetLink = "https://localhost:8080/reset-password?token=" + token; + String resetLink = "https://localhost:8080/reset-password?token=" + createdToken.getT_value(); String emailBody = "Click the link to reset your password: " + resetLink; @@ -66,7 +73,7 @@ public String showResetPasswordForm(@RequestParam("token") String tokenValue, Model model){ - Users user = usersService.findUserByResetToken(tokenValue); - Token token = tokenRepository.findTokenByValue(tokenValue); - if(user==null || token.getTokenExpiryDate().isBefore(LocalDateTime.now())){ + UsersLoadingDto user = usersService.findUserByResetToken(tokenValue); + TokenDto token = tokenRepository.findTokenByValue(tokenValue); + if(user==null || token.getT_expiry().isBefore(LocalDateTime.now())){ model.addAttribute("error", "Invalid or expired token."); return "authentication/reset-password"; @@ -83,7 +90,7 @@ Model model){ - Users user = usersService.findUserByResetToken(tokenValue); - Token token = tokenRepository.findTokenByValue(tokenValue); - if (user == null || token.getTokenExpiryDate().isBefore(LocalDateTime.now())) { + UsersLoadingDto user = usersService.findUserByResetToken(tokenValue); + TokenDto token = tokenRepository.findTokenByValue(tokenValue); + if (user.getUserId() == null || token.getT_expiry().isBefore(LocalDateTime.now())) { model.addAttribute("error", "Invalid or expired token."); return "authentication/reset-password"; @@ -96,8 +103,15 @@ user.setUserPassword(passwordEncoder.encodeWithSalt(newPassword,user.getUserSalt())); - token.setTokenValidatedAt(LocalDateTime.now()); - tokenRepository.save(token); + token.setT_validated_at(LocalDateTime.now()); + tokenRepository.edit( + token.getT_id(), + token.getT_value(), + token.getT_expiry(), + token.getUser_id(), + token.getT_validated_at(), + token.getT_type() + ); - UserDto dto = this.usersService.buildDto(user); + UserDto dto = this.usersService.findUserDtoByEmail(user.getUserEmail()); this.usersService.edit(dto); Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/RestAuthController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/security/auth/RestAuthController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,36 +1,0 @@ -package mk.ukim.finki.db.distributorapp.security.auth; - -import mk.ukim.finki.db.distributorapp.model.dto.LoginRequestDto; -import mk.ukim.finki.db.distributorapp.model.dto.LoginResponseDto; -import mk.ukim.finki.db.distributorapp.model.dto.RegisterRequestDto; -import mk.ukim.finki.db.distributorapp.model.entities.Users; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/rest/auth") -public class RestAuthController { - - private final AuthService authService; - - public RestAuthController(AuthService authService) { - this.authService = authService; - } - - @PostMapping("/login") - public ResponseEntity login(@ModelAttribute LoginRequestDto loginRequest) { - Users user = authService.login(loginRequest); - return ResponseEntity.ok(new LoginResponseDto(user.getUserEmail())); - } - - @PostMapping("/register") - public ResponseEntity register(@ModelAttribute RegisterRequestDto registerRequest) throws Exception { - authService.register(registerRequest); - return ResponseEntity.status(HttpStatus.CREATED).body("User registered successfully"); - } - -} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleService.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -8,8 +8,4 @@ List getAllArticles(); - ArticleDto findById(Long id); - - List findAllByName(String name); - void deleteById(Long id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleUnitService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleUnitService.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ArticleUnitService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -4,6 +4,4 @@ import mk.ukim.finki.db.distributorapp.model.dto.ArticleUnitSimpleDto; import mk.ukim.finki.db.distributorapp.model.dto.OrderItemDto; -import mk.ukim.finki.db.distributorapp.model.dto.UnitPriceDto; -import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import org.springframework.transaction.annotation.Transactional; @@ -13,18 +11,10 @@ List getAllArticleUnits(); - List findALlByName(String name); - - List findAllByWarehouse(Warehouse warehouse); - - ArticleUnitDto findById(Long id); - Integer create(ArticleUnitDto articleUnitDto); Integer edit(ArticleUnitDto articleUnitDto); - + // TODO: Change edit and simpleEdit method @Transactional Integer simpleEdit(ArticleUnitSimpleDto articleUnitSimpleDto); - - Integer addArticleUnitWithPrice(ArticleUnitDto articleUnitDto, UnitPriceDto unitPriceDto); void delete(Long id); @@ -32,6 +22,4 @@ List getAllArticleUnitsByWarehouse(Integer warehouseId); - List findAllByArticleAndWarehouse(Long articleId, Integer warehouseId); - List findAllSimpleByArticleAndWarehouse(Long articleId, Integer warehouseId); 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CategoryService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -9,8 +9,4 @@ List listCategories(); - CategoryDto getCategoryById(Integer id); - - List searchCategories(String text); - Integer create(CategoryDto categoryDto); 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CityService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,20 +3,10 @@ import mk.ukim.finki.db.distributorapp.model.dto.CityDto; import mk.ukim.finki.db.distributorapp.model.dto.CityDtoRegister; -import mk.ukim.finki.db.distributorapp.model.entities.City; import java.util.List; -import java.util.Optional; public interface CityService { - List listCitiesObj(); - - List listCities(); - List findAllCityDtos(); - - CityDto getCityById(Integer id); - - Optional getCityObjById(Integer id); Integer create(CityDto cityDto); @@ -25,5 +15,3 @@ void deleteById(Integer id); - - List searchCities(String text); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerService.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,9 +3,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.CustomerDto; -import java.util.List; - public interface CustomerService { - - List findAllCustomers(); CustomerDto findCustomerById(Long id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerWeekdayService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerWeekdayService.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/CustomerWeekdayService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -6,7 +6,4 @@ public interface CustomerWeekdayService { - List getAllWeekdays(); - - List getWeekdaysByCustomerId(Long customerId); Integer create(CustomerWeekdayDto customerWeekdayDto); 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -5,15 +5,8 @@ import mk.ukim.finki.db.distributorapp.model.dto.DeliveryFullDto; import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto; -import mk.ukim.finki.db.distributorapp.model.entities.Driver; -import mk.ukim.finki.db.distributorapp.model.entities.Vehicle; import java.util.List; public interface DeliveryService { - List getAllDeliveries(); - - List getAllDeliveriesByVehicleId(Vehicle vehicle); - - List getAllDeliveriesByDriver(Driver driver); DeliveryFullDto findDeliveryById(Long 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryStatusService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,11 +3,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.DeliveryStatusDto; -import java.util.List; - public interface DeliveryStatusService { - - List getAllDeliveryStatus(); - - DeliveryStatusDto getDeliveryStatusById(Short id); Integer create(DeliveryStatusDto deliveryStatusDto); @@ -15,6 +9,4 @@ Integer edit(DeliveryStatusDto deliveryStatusDto); - List getDeliveryStatusByName(String name); - 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -5,5 +5,4 @@ import mk.ukim.finki.db.distributorapp.model.dto.DeliveryStartDto; import mk.ukim.finki.db.distributorapp.model.dto.DriverDto; -import mk.ukim.finki.db.distributorapp.model.entities.Driver; import java.util.List; @@ -11,11 +10,5 @@ public interface DriverService { - List getAllDrivers(); - - List findAllByName(String name); - DriverDto findById(Long id); - - Driver getDriverObjById(Long id); Integer create(DriverDto driverDto); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManagerService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManagerService.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManagerService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -2,15 +2,6 @@ import mk.ukim.finki.db.distributorapp.model.dto.ManagerDto; -import mk.ukim.finki.db.distributorapp.model.entities.Manager; - -import java.util.List; public interface ManagerService { - - List getAllManagers(); - - ManagerDto getManagerById(Long id); - - Manager getManagerByIdObj(Long id); Integer create(ManagerDto managerDto); 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ManufacturerService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -8,8 +8,4 @@ List getAllManufacturers(); - List findAllManufacturersByName(String name); - - ManufacturerDto findManufacturerById(Long id); - Integer create(ManufacturerDto manufacturerDto); 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrderStatusService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,10 +3,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.OrderStatusDto; -import java.util.List; - public interface OrderStatusService { - List getAllOrderStatus(); - - OrderStatusDto getOrderStatusById(Short id); Integer create(OrderStatusDto orderStatusDto); @@ -14,6 +9,4 @@ Integer edit(OrderStatusDto orderStatusDto); - List getOrderStatusByName(String name); - void deleteById(Short id); } 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -11,7 +11,4 @@ public interface OrdersService { - List getAllOrders(); - - List findOrdersByCustomer(Long customerId); List findSimpleOrdersByCustomer(Long customerId); 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/PriceService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -7,7 +7,4 @@ public interface PriceService { - List getAllPrices(); - - List findAllPricesByArticleId(Article article); Integer create(PriceDto priceDto); 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -10,6 +10,4 @@ List getAllProForma(); - ProFormaDto findProFormaById(Long id); - Integer create(ProFormaDto proFormaDto); 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaStatusService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,10 +3,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.ProFormaStatusDto; -import java.util.List; - public interface ProFormaStatusService { - List getAllProFormaStatus(); - - ProFormaStatusDto getProFormaStatusById(Short id); Integer create(ProFormaStatusDto proFormaStatusDto); @@ -14,6 +9,4 @@ Integer edit (ProFormaStatusDto proFormaStatusDto ); - List getProFormaStatusByName(String name); - 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/RegionService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,13 +3,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.RegionDto; -import java.util.List; - public interface RegionService { - - List getAllRegions(); - - RegionDto getRegionById(Integer id); - - List searchRegions(String name); Integer create(RegionDto regionDto ); @@ -17,6 +9,4 @@ Integer edit(RegionDto regionDto); - RegionDto getRegionByCityId(Integer cityId); - void deleteById(Integer id); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/UsersService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/UsersService.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/UsersService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -2,16 +2,11 @@ import mk.ukim.finki.db.distributorapp.model.dto.UserDto; -import mk.ukim.finki.db.distributorapp.model.entities.Users; - -import java.util.List; +import mk.ukim.finki.db.distributorapp.model.dto.UsersLoadingDto; public interface UsersService { - List findAllUsers(); - Users findUserById(Long id); - Users findUserByEmail(String email); Integer edit(UserDto userDto); - Integer deleteUserById(Long id); - UserDto buildDto(Users user); - Users findUserByResetToken(String token); + void deleteUserById(Long id); + UsersLoadingDto findUserByResetToken(String token); UserDto findUserDtoByEmail(String userEmail); + UsersLoadingDto findFullUserDtoByEmail(String userEmail); } 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/VehicleService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -7,6 +7,4 @@ public interface VehicleService { - - List getAllVehicles(); List getVehiclesByWarehouse(Integer warehouseId); 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WarehouseService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -8,7 +8,4 @@ public interface WarehouseService { - List getAllWarehouses(); - - List findAllByCity(City city); WarehouseDto findById(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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WeekdayService.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -6,9 +6,4 @@ public interface WeekdayService { - List getAllWeekdays(); - - WeekdayDto getWeekdayByName(String weekdayName); - - WeekdayDto findWeekdayById(Short id); Integer create(WeekdayDto weekdayDto); 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,5 +3,4 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.ArticleDto; -import mk.ukim.finki.db.distributorapp.model.entities.Article; import mk.ukim.finki.db.distributorapp.repository.ArticleRepository; import mk.ukim.finki.db.distributorapp.service.ArticleService; @@ -18,39 +17,4 @@ public List getAllArticles() { return this.articleRepository.listAll(); - } - - @Override - public ArticleDto findById(Long id) { - Article art = this.articleRepository.findById(id).get(); - return new ArticleDto( - art.getArticleId(), - art.getArticleName(), - art.getManufacturer().getManufacturerName(), - 0L, - art.getManufacturer().getManufacturerId(), - art.getPrices().get(art.getPrices().size() - 1).getPrice(), - art.getCategory().getCategoryName(), - art.getCategory().getCategoryId(), - art.getArticleWeight(), - art.getArtImage() - ); - } - - @Override - public List findAllByName(String name) { - List
articles = this.articleRepository.findAllByName("'" + name + "'"); - - return articles.stream().map(art -> new ArticleDto( - art.getArticleId(), - art.getArticleName(), - art.getManufacturer().getManufacturerName(), - 0L, - art.getManufacturer().getManufacturerId(), - art.getPrices().get(art.getPrices().size() - 1).getPrice(), - art.getCategory().getCategoryName(), - art.getCategory().getCategoryId(), - art.getArticleWeight(), - art.getArtImage() - )).toList(); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleUnitServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleUnitServiceImpl.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ArticleUnitServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -5,10 +5,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.ArticleUnitSimpleDto; import mk.ukim.finki.db.distributorapp.model.dto.OrderItemDto; -import mk.ukim.finki.db.distributorapp.model.dto.UnitPriceDto; -import mk.ukim.finki.db.distributorapp.model.entities.ArticleUnit; -import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; -import mk.ukim.finki.db.distributorapp.model.exceptions.InvalidArgumentsException; import mk.ukim.finki.db.distributorapp.repository.ArticleUnitRepository; -import mk.ukim.finki.db.distributorapp.repository.PriceRepository; import mk.ukim.finki.db.distributorapp.repository.UnitPriceRepository; import mk.ukim.finki.db.distributorapp.repository.WarehouseRepository; @@ -26,67 +21,8 @@ private final WarehouseRepository warehouseRepository; private final UnitPriceRepository unitPriceRepository; - private final PriceRepository priceRepository; - - private List buildDto(List articleUnits) { - List res = new ArrayList<>(); - for (ArticleUnit unit : articleUnits) { - Warehouse wh = this.warehouseRepository.findById(unit.getWarehouse().getWarehouseId()).get(); - ArticleUnitDto dto = new ArticleUnitDto( - unit.getUnitId(), - unit.getUnitExpirationDate(), - unit.getUnitSerialNumber(), - unit.getUnitBatchNumber(), - unit.getUnitManufactureDate(), - unit.getUnitCostPrice(), - unit.getArticle().getArticleId(), - unit.getArticle().getArticleName(), - wh.getWarehouseId(), - wh.getCity().getRegion().getRegionName(), - wh.getCity().getCityName(), - unit.getOrder().getOrderId(), - unit.getOrder().getCustomer().getUserEmail() - ); - res.add(dto); - } - return res; - } @Override public List getAllArticleUnits() { return this.articleUnitRepository.listAll(); - - } - - @Override - public List findALlByName(String name) { - List articleUnits = this.articleUnitRepository.findAllByName("'" + name + "'"); - - return buildDto(articleUnits); - } - - @Override - public List findAllByWarehouse(Warehouse warehouse) { - return this.articleUnitRepository.findAllByWarehouse(warehouse.getWarehouseId()); - } - - @Override - public ArticleUnitDto findById(Long id) { - ArticleUnit articleUnit = this.articleUnitRepository.findById(id).orElseThrow(InvalidArgumentsException::new); - Warehouse wh = this.warehouseRepository.findById(articleUnit.getWarehouse().getWarehouseId()).orElseThrow(InvalidArgumentsException::new); - return new ArticleUnitDto( - articleUnit.getUnitId(), - articleUnit.getUnitExpirationDate(), - articleUnit.getUnitSerialNumber(), - articleUnit.getUnitBatchNumber(), - articleUnit.getUnitManufactureDate(), - articleUnit.getUnitCostPrice(), - articleUnit.getArticle().getArticleId(), - articleUnit.getArticle().getArticleName(), - wh.getWarehouseId(), - wh.getCity().getRegion().getRegionName(), - wh.getCity().getCityName(), - articleUnit.getOrder().getOrderId(), - articleUnit.getOrder().getCustomer().getUserEmail() - ); } @@ -136,21 +72,4 @@ @Override - @Transactional - public Integer addArticleUnitWithPrice(ArticleUnitDto articleUnitDto, UnitPriceDto unitPriceDto) { - this.articleUnitRepository.create( - articleUnitDto.getExpiryDate(), - articleUnitDto.getSerialNo(), - articleUnitDto.getBatchNo(), - articleUnitDto.getManufactureDate(), - articleUnitDto.getCostPrice(), - articleUnitDto.getWhId(), - articleUnitDto.getOrdId() - ); - this.unitPriceRepository.create(unitPriceDto.getUnitId(),unitPriceDto.getPriceId()); - - return 0; - } - - @Override public void delete(Long id) { this.articleUnitRepository.deleteById(id); @@ -160,9 +79,4 @@ public List getAllArticleUnitsByWarehouse(Integer warehouseId) { return this.articleUnitRepository.findAllByWarehouse(warehouseId); - } - - @Override - public List findAllByArticleAndWarehouse(Long articleId, Integer warehouseId) { - return this.articleUnitRepository.findAllByArticleAndWarehouse(articleId,warehouseId); } 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CategoryServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,10 +3,8 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.CategoryDto; -import mk.ukim.finki.db.distributorapp.model.entities.Category; import mk.ukim.finki.db.distributorapp.repository.CategoryRepository; import mk.ukim.finki.db.distributorapp.service.CategoryService; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; @@ -16,30 +14,7 @@ private final CategoryRepository categoryRepository; - - private List buildDto(List categories) { - List dtos = new ArrayList<>(); - for (Category category : categories) { - CategoryDto dto = new CategoryDto( - category.getCategoryId(), - category.getCategoryName() - ); - dtos.add(dto); - } - return dtos; - } - @Override public List listCategories() { - List categories = this.categoryRepository.listAll(); - return buildDto(categories); - } - - @Override - public CategoryDto getCategoryById(Integer id) { - Category ctg = this.categoryRepository.findById(id).get(); - return new CategoryDto( - ctg.getCategoryId(), - ctg.getCategoryName() - ); + return this.categoryRepository.listAll(); } @@ -59,8 +34,3 @@ } - @Override - public List searchCategories(String text) { - List categories = this.categoryRepository.findAllByName("'"+text+"'"); - return buildDto(categories); - } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CityServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CityServiceImpl.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CityServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -4,12 +4,9 @@ import mk.ukim.finki.db.distributorapp.model.dto.CityDto; import mk.ukim.finki.db.distributorapp.model.dto.CityDtoRegister; -import mk.ukim.finki.db.distributorapp.model.entities.City; import mk.ukim.finki.db.distributorapp.repository.CityRepository; import mk.ukim.finki.db.distributorapp.service.CityService; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; -import java.util.Optional; @Service @@ -18,49 +15,7 @@ private final CityRepository cityRepository; - private List buildDto(List cities) { - List dtos = new ArrayList<>(); - for (City city : cities) { - CityDto dto = new CityDto( - city.getCityId(), - city.getCityName(), - city.getRegion().getRegionId(), - city.getRegion().getRegionName() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List listCitiesObj() { - return cityRepository.listAll(); - } - - @Override - public List listCities() { - List cities = cityRepository.listAll(); - return buildDto(cities); - } - @Override public List findAllCityDtos() { return this.cityRepository.findAllCityDtos(); - } - - @Override - public CityDto getCityById(Integer id) { - City city = cityRepository.findById(id).orElseThrow(); - - return new CityDto( - city.getCityId(), - city.getCityName(), - city.getRegion().getRegionId(), - city.getRegion().getRegionName() - ); - } - - @Override - public Optional getCityObjById(Integer id){ - return this.cityRepository.findById(id); } @@ -79,9 +34,3 @@ this.cityRepository.deleteById(id); } - - @Override - public List searchCities(String text) { - List cities = this.cityRepository.findByName("'" + text + "'"); - return buildDto(cities); - } } 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,11 +3,7 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.CustomerDto; -import mk.ukim.finki.db.distributorapp.model.entities.Customer; import mk.ukim.finki.db.distributorapp.repository.CustomerRepository; import mk.ukim.finki.db.distributorapp.service.CustomerService; import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; @Service @@ -16,28 +12,4 @@ private final CustomerRepository customerRepository; - - private List buildDto(List customers) { - List dtos = new ArrayList<>(); - for (Customer customer : customers) { - CustomerDto dto = new CustomerDto( - customer.getUserId(), - customer.getUsername(), - customer.getUserEmail(), - customer.getUserMobile(), - customer.getCustomerEDB(), - customer.getCustomerCompanyName(), - customer.getCustomerAddress(), - customer.getCustomerRepresentativeImage() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List findAllCustomers() { - List customers = this.customerRepository.findAll(); - return buildDto(customers); - } @Override Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerWeekdayServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerWeekdayServiceImpl.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/CustomerWeekdayServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -15,34 +15,4 @@ public class CustomerWeekdayServiceImpl implements CustomerWeekdayService { private final CustomerWeekdayRepository customerWeekdayRepository; - - - private List buildDto(List customerWeekdays) { - List dtos = new ArrayList<>(); - for (CustomerWeekday customerWeekday : customerWeekdays) { - CustomerWeekdayDto dto = new CustomerWeekdayDto( - customerWeekday.getCustomerDayId(), - customerWeekday.getCustomer().getUserId(), - customerWeekday.getCustomer().getCustomerCompanyName(), - customerWeekday.getDay().getId(), - customerWeekday.getDay().getDayName(), - customerWeekday.getCustomerDayStartTime(), - customerWeekday.getCustomerDayEndTime() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List getAllWeekdays() { - List customerWeekdays = customerWeekdayRepository.listAll(); - return buildDto(customerWeekdays); - } - - @Override - public List getWeekdaysByCustomerId(Long customerId) { - List customerWeekdays = this.customerWeekdayRepository.findByCustomerId(customerId); - return buildDto(customerWeekdays); - } @Override 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -6,12 +6,8 @@ import mk.ukim.finki.db.distributorapp.model.dto.DeliveryFullDto; import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto; -import mk.ukim.finki.db.distributorapp.model.entities.Delivery; -import mk.ukim.finki.db.distributorapp.model.entities.Driver; -import mk.ukim.finki.db.distributorapp.model.entities.Vehicle; import mk.ukim.finki.db.distributorapp.repository.DeliveryRepository; import mk.ukim.finki.db.distributorapp.service.DeliveryService; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -21,45 +17,4 @@ public class DeliveryServiceImpl implements DeliveryService { private final DeliveryRepository deliveryRepository; - - private List buildDto(List deliveries) { - List dtos = new ArrayList<>(); - for (Delivery del : deliveries) { - DeliveryDto dto = new DeliveryDto( - del.getDeliveryId(), - del.getDeliveryDateCreated(), - del.getDeliveryDate(), - del.getDeliveryStartKm(), - del.getDeliveryEndKm(), - null, - null, - del.getDeliveryStatus().getDeliveryStatusId(), - del.getDeliveryStatus().getDeliveryStatusName(), - del.getVehicle().getVehicleId(), - del.getVehicle().getDriver().getUserId(), - del.getVehicle().getDriver().getUsername(), - del.getVehicle().getDriver().getUserImage() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List getAllDeliveries() { - List deliveries = this.deliveryRepository.listAll(); - return buildDto(deliveries); - } - - @Override - public List getAllDeliveriesByVehicleId(Vehicle vehicle) { - List deliveries = this.deliveryRepository.findAllByVehicle(vehicle.getVehicleId()); - return buildDto(deliveries); - } - - @Override - public List getAllDeliveriesByDriver(Driver driver) { - List deliveries = this.deliveryRepository.findDeliveriesByDriver(driver.getUserId()); - return buildDto(deliveries); - } @Override 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryStatusServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,11 +3,7 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.DeliveryStatusDto; -import mk.ukim.finki.db.distributorapp.model.entities.DeliveryStatus; import mk.ukim.finki.db.distributorapp.repository.DeliveryStatusRepository; import mk.ukim.finki.db.distributorapp.service.DeliveryStatusService; import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; @Service @@ -15,34 +11,4 @@ public class DeliveryStatusServiceImpl implements DeliveryStatusService { private final DeliveryStatusRepository deliveryStatusRepository; - - - private List buildDto(List deliveryStatuses) { - List dtos = new ArrayList<>(); - for (DeliveryStatus deliveryStatus : deliveryStatuses) { - DeliveryStatusDto dto = new DeliveryStatusDto( - deliveryStatus.getDeliveryStatusId(), - deliveryStatus.getDeliveryStatusName(), - deliveryStatus.getDeliveryStatusDescription() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List getAllDeliveryStatus() { - List deliveryStatuses = this.deliveryStatusRepository.listAll(); - return buildDto(deliveryStatuses); - } - - @Override - public DeliveryStatusDto getDeliveryStatusById(Short id) { - DeliveryStatus deliveryStatus = this.deliveryStatusRepository.findById(id).get(); - return new DeliveryStatusDto( - deliveryStatus.getDeliveryStatusId(), - deliveryStatus.getDeliveryStatusName(), - deliveryStatus.getDeliveryStatusDescription() - ); - } @Override @@ -62,10 +28,4 @@ @Override - public List getDeliveryStatusByName(String name) { - List deliveryStatuses = this.deliveryStatusRepository.findAllByName("'"+name+"'"); - return buildDto(deliveryStatuses); - } - - @Override 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,5 +3,4 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.*; -import mk.ukim.finki.db.distributorapp.model.entities.Driver; import mk.ukim.finki.db.distributorapp.repository.DriverRepository; import mk.ukim.finki.db.distributorapp.service.DeliveryService; @@ -12,5 +11,4 @@ import java.time.LocalTime; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; import java.util.List; @@ -21,48 +19,7 @@ private final DeliveryService deliveryService; - private List buildDto(List drivers) { - List dtos = new ArrayList<>(); - for (Driver driver : drivers) { - DriverDto dto = new DriverDto( - driver.getUserId(), - driver.getUsername(), - driver.getUserEmail(), - driver.getUserMobile(), - driver.getUserImage(), - driver.getVehicle().getVehicleId() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List getAllDrivers() { - List drivers = this.driverRepository.listAll(); - return buildDto(drivers); - } - - @Override - public List findAllByName(String name) { - List drivers = this.driverRepository.findAllByName("'"+name+"'"); - return buildDto(drivers); - } - @Override public DriverDto findById(Long id) { - Driver driver = this.driverRepository.findById(id).get(); - return new DriverDto( - driver.getUserId(), - driver.getUsername(), - driver.getUserEmail(), - driver.getUserMobile(), - driver.getUserImage(), - driver.getVehicle().getVehicleId() - ); - } - - @Override - public Driver getDriverObjById(Long id) { - return this.driverRepository.findById(id).get(); + return this.driverRepository.findDriverById(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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManagerServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,11 +3,7 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.ManagerDto; -import mk.ukim.finki.db.distributorapp.model.entities.Manager; import mk.ukim.finki.db.distributorapp.repository.ManagerRepository; import mk.ukim.finki.db.distributorapp.service.ManagerService; import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; @Service @@ -16,54 +12,10 @@ private final ManagerRepository managerRepository; - - private List buildDto(List managers) { - List dtos = new ArrayList<>(); - for (Manager manager : managers) { - ManagerDto dto = new ManagerDto( - manager.getUserId(), - manager.getUsername(), - manager.getUserEmail(), - manager.getUserMobile(), - manager.getUserImage(), - manager.getWarehouse().getWarehouseId(), - manager.getWarehouse().getCity().getRegion().getRegionName(), - manager.getWarehouse().getCity().getCityName() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List getAllManagers() { - List managers = this.managerRepository.findAll(); - return buildDto(managers); - } - - @Override - public ManagerDto getManagerById(Long id) { - Manager manager = this.managerRepository.findById(id).get(); - - return new ManagerDto( - manager.getUserId(), - manager.getUsername(), - manager.getUserEmail(), - manager.getUserMobile(), - manager.getUserImage(), - manager.getWarehouse().getWarehouseId(), - manager.getWarehouse().getCity().getRegion().getRegionName(), - manager.getWarehouse().getCity().getCityName() - ); - } - - public Manager getManagerByIdObj(Long id){ - return this.managerRepository.findById(id).get(); - } - @Override public Integer create(ManagerDto managerDto) { return this.managerRepository.create( managerDto.getId(), - managerDto.getWhId()); + managerDto.getWhId() + ); } @@ -72,5 +24,6 @@ return this.managerRepository.edit( managerDto.getId(), - managerDto.getWhId()); + managerDto.getWhId() + ); } 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ManufacturerServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,10 +3,8 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.ManufacturerDto; -import mk.ukim.finki.db.distributorapp.model.entities.Manufacturer; import mk.ukim.finki.db.distributorapp.repository.ManufacturerRepository; import mk.ukim.finki.db.distributorapp.service.ManufacturerService; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; @@ -16,41 +14,7 @@ private final ManufacturerRepository manufacturerRepository; - - private List buildDto(List manufacturers) { - List dtos = new ArrayList<>(); - for (Manufacturer manufacturer : manufacturers) { - ManufacturerDto dto = new ManufacturerDto( - manufacturer.getManufacturerId(), - manufacturer.getManufacturerName(), - manufacturer.getManufacturerAddress(), - manufacturer.getManufacturerMobile(), - manufacturer.getManufacturerEmail() - ); - dtos.add(dto); - } - return dtos; - } - @Override public List getAllManufacturers() { return this.manufacturerRepository.listAll(); - } - - @Override - public List findAllManufacturersByName(String name) { - List manufacturers = this.manufacturerRepository.findAllByName("'"+name+"'"); - return buildDto(manufacturers); - } - - @Override - public ManufacturerDto findManufacturerById(Long id) { - Manufacturer manufacturer = this.manufacturerRepository.findById(id).get(); - return new ManufacturerDto( - manufacturer.getManufacturerId(), - manufacturer.getManufacturerName(), - manufacturer.getManufacturerAddress(), - manufacturer.getManufacturerMobile(), - manufacturer.getManufacturerEmail() - ); } 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrderStatusServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,11 +3,7 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.OrderStatusDto; -import mk.ukim.finki.db.distributorapp.model.entities.OrderStatus; import mk.ukim.finki.db.distributorapp.repository.OrderStatusRepository; import mk.ukim.finki.db.distributorapp.service.OrderStatusService; import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; @Service @@ -15,34 +11,4 @@ public class OrderStatusServiceImpl implements OrderStatusService { private final OrderStatusRepository orderStatusRepository; - - private List buildDto(List orderStatuses) { - List dtos = new ArrayList<>(); - for (OrderStatus orderStatus : orderStatuses) { - OrderStatusDto dto = new OrderStatusDto( - orderStatus.getOrderStatusId(), - orderStatus.getOrderStatusName(), - orderStatus.getOrderStatusDescription() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List getAllOrderStatus() { - List orderStatuses = this.orderStatusRepository.findAll(); - return buildDto(orderStatuses); - } - - @Override - public OrderStatusDto getOrderStatusById(Short id) { - OrderStatus orderStatus = this.orderStatusRepository.findById(id).get(); - - return new OrderStatusDto( - orderStatus.getOrderStatusId(), - orderStatus.getOrderStatusName(), - orderStatus.getOrderStatusDescription() - ); - } @Override @@ -64,10 +30,4 @@ @Override - public List getOrderStatusByName(String name) { - List orderStatuses = this.orderStatusRepository.findAllByName("'" + name + "'"); - return buildDto(orderStatuses); - } - - @Override public void deleteById(Short id) { this.orderStatusRepository.deleteById(id); 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,5 +3,4 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.*; -import mk.ukim.finki.db.distributorapp.model.entities.Orders; import mk.ukim.finki.db.distributorapp.repository.OrdersRepository; import mk.ukim.finki.db.distributorapp.service.*; @@ -12,5 +11,4 @@ import java.security.Principal; import java.time.LocalDate; -import java.util.ArrayList; import java.util.List; @@ -20,48 +18,6 @@ private final OrdersRepository ordersRepository; private final UsersService usersService; - private final WarehouseService warehouseService; - private final ArticleUnitService articleUnitService; private final CustomerService customerService; private final ProFormaService proFormaService; - - - - private List buildDto(List orders) { - List dtos = new ArrayList<>(); - for (Orders ord : orders) { - OrdersDto orderDto = new OrdersDto( - ord.getOrderId(), - ord.getOrderDate(), - ord.getOrderSum(), - ord.getOrderFulfillmentDate(), - ord.getOrderComment(), - ord.getOrderStatus().getOrderStatusId(), - ord.getOrderStatus().getOrderStatusName(), - ord.getCustomer().getUserId(), - ord.getCustomer().getCustomerCompanyName(), - ord.getCustomer().getUserMobile(), - ord.getCustomer().getUserEmail(), - ord.getDelivery().getDeliveryId(), - ord.getDelivery().getVehicle().getDriver().getUserId(), - ord.getDelivery().getVehicle().getDriver().getUsername(), - ord.getDelivery().getVehicle().getDriver().getUserMobile(), - ord.getDelivery().getVehicle().getDriver().getUserEmail(), - ord.getProForma().getProFormaId(), - ord.getProForma().getProFormaStatus().getProFormaStatusName() - ); - dtos.add(orderDto); - } - return dtos; - } - - @Override - public List getAllOrders() { - return this.ordersRepository.listAll(); - } - - @Override - public List findOrdersByCustomer(Long customerId) { - return this.ordersRepository.findOrdersByCustomer(customerId); - } @Override 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/PriceServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,12 +3,7 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.PriceDto; -import mk.ukim.finki.db.distributorapp.model.entities.Article; -import mk.ukim.finki.db.distributorapp.model.entities.Price; import mk.ukim.finki.db.distributorapp.repository.PriceRepository; import mk.ukim.finki.db.distributorapp.service.PriceService; import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; @Service @@ -16,32 +11,4 @@ public class PriceServiceImpl implements PriceService { private final PriceRepository priceRepository; - - - private List buildDto(List prices) { - List dtos = new ArrayList<>(); - for (Price price : prices) { - PriceDto dto = new PriceDto( - price.getPriceId(), - price.getPrice(), - price.getPriceEffectiveDate(), - price.getArticle().getArticleId(), - price.getArticle().getArticleName() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List getAllPrices() { - List prices = this.priceRepository.listAll(); - return buildDto(prices); - } - - @Override - public List findAllPricesByArticleId(Article article) { - List prices = this.priceRepository.findAllByArticleId(article.getArticleId()); - return buildDto(prices); - } @Override 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,5 +3,4 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.ProFormaDto; -import mk.ukim.finki.db.distributorapp.model.entities.ProForma; import mk.ukim.finki.db.distributorapp.repository.ProFormaRepository; import mk.ukim.finki.db.distributorapp.service.ProFormaService; @@ -9,5 +8,4 @@ import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.List; @@ -17,46 +15,8 @@ private final ProFormaRepository proFormaRepository; - - private List buildDto(List proFormas) { - List proFormaDtos = new ArrayList<>(); - for (ProForma pf : proFormas) { - ProFormaDto proFormaDto = new ProFormaDto( - pf.getProFormaId(), - pf.getProFormaDeadline(), - pf.getProFormaDateCreated(), - pf.getProFormaStatus().getProFormaStatusId(), - pf.getProFormaStatus().getProFormaStatusName(), - pf.getOrder().getOrderId(), - pf.getOrder().getCustomer().getUserId(), - pf.getOrder().getCustomer().getCustomerCompanyName(), - pf.getOrder().getCustomer().getUserEmail(), - pf.getOrder().getCustomer().getUserMobile() - ); - proFormaDtos.add(proFormaDto); - } - return proFormaDtos; - } - @Override @Transactional public List getAllProForma() { return this.proFormaRepository.listAll(); - } - - @Override - public ProFormaDto findProFormaById(Long id) { - ProForma pf = this.proFormaRepository.findById(id).get(); - return new ProFormaDto( - pf.getProFormaId(), - pf.getProFormaDeadline(), - pf.getProFormaDateCreated(), - pf.getProFormaStatus().getProFormaStatusId(), - pf.getProFormaStatus().getProFormaStatusName(), - pf.getOrder().getOrderId(), - pf.getOrder().getCustomer().getUserId(), - pf.getOrder().getCustomer().getCustomerCompanyName(), - pf.getOrder().getCustomer().getUserEmail(), - pf.getOrder().getCustomer().getUserMobile() - ); } 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaStatusServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,11 +3,7 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.ProFormaStatusDto; -import mk.ukim.finki.db.distributorapp.model.entities.ProFormaStatus; import mk.ukim.finki.db.distributorapp.repository.ProFormaStatusRepository; import mk.ukim.finki.db.distributorapp.service.ProFormaStatusService; import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; @Service @@ -15,34 +11,4 @@ public class ProFormaStatusServiceImpl implements ProFormaStatusService { private final ProFormaStatusRepository proFormaStatusRepository; - - - private List buildDto(List proFormaStatuses) { - List proFormaStatusDtos = new ArrayList<>(); - for (ProFormaStatus proFormaStatus : proFormaStatuses) { - ProFormaStatusDto proFormaStatusDto = new ProFormaStatusDto( - proFormaStatus.getProFormaStatusId(), - proFormaStatus.getProFormaStatusName(), - proFormaStatus.getProFormaStatusDescription() - ); - proFormaStatusDtos.add(proFormaStatusDto); - } - return proFormaStatusDtos; - } - - @Override - public List getAllProFormaStatus() { - List proFormaStatuses = this.proFormaStatusRepository.findAll(); - return buildDto(proFormaStatuses); - } - - @Override - public ProFormaStatusDto getProFormaStatusById(Short id) { - ProFormaStatus status = this.proFormaStatusRepository.findById(id).get(); - return new ProFormaStatusDto( - status.getProFormaStatusId(), - status.getProFormaStatusName(), - status.getProFormaStatusDescription() - ); - } @Override @@ -64,10 +30,4 @@ @Override - public List getProFormaStatusByName(String name) { - List statuses = this.proFormaStatusRepository.findAllByName("'"+name+"'"); - return buildDto(statuses); - } - - @Override 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/RegionServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,11 +3,7 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.RegionDto; -import mk.ukim.finki.db.distributorapp.model.entities.Region; import mk.ukim.finki.db.distributorapp.repository.RegionRepository; import mk.ukim.finki.db.distributorapp.service.RegionService; import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; @Service @@ -15,37 +11,4 @@ public class RegionServiceImpl implements RegionService { private final RegionRepository regionRepository; - - private List buildDto(List regions) { - List dtos = new ArrayList<>(); - for (Region region : regions) { - RegionDto dto = new RegionDto( - region.getRegionId(), - region.getRegionName() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List getAllRegions() { - List regions = this.regionRepository.listAll(); - return buildDto(regions); - } - - @Override - public RegionDto getRegionById(Integer id) { - Region region = this.regionRepository.findById(id).get(); - return new RegionDto( - region.getRegionId(), - region.getRegionName() - ); - } - - @Override - public List searchRegions(String name) { - List regions = this.regionRepository.findByName("'" + name + "'"); - return buildDto(regions); - } @Override @@ -65,9 +28,4 @@ @Override - public RegionDto getRegionByCityId(Integer cityId) { - return this.regionRepository.getRegionByCityId(cityId); - } - - @Override public void deleteById(Integer id) { this.regionRepository.deleteById(id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/UsersServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/UsersServiceImpl.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/UsersServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,10 +3,8 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.UserDto; -import mk.ukim.finki.db.distributorapp.model.entities.Users; +import mk.ukim.finki.db.distributorapp.model.dto.UsersLoadingDto; import mk.ukim.finki.db.distributorapp.repository.UsersRepository; import mk.ukim.finki.db.distributorapp.service.UsersService; import org.springframework.stereotype.Service; - -import java.util.List; @Service @@ -16,38 +14,7 @@ private final UsersRepository usersRepository; - public UserDto buildDto(Users user){ - return new UserDto( - user.getUserId(), - user.getUsername(), - user.getUserSurname(), - user.getUserEmail(), - user.getUserMobile(), - user.getUserImage(), - user.getCity().getCityId(), - user.getCity().getCityName(), - user.getCity().getRegion().getRegionName(), - user.getUserRole().toString(), - user.getClazz_(), - user.getUserActive()); - } - - @Override - public List findAllUsers() { - return this.usersRepository.listAll(); - } - - @Override - public Users findUserById(Long id) { - return this.usersRepository.findById(id).get(); - } - - @Override - public Users findUserByEmail(String email) { - return this.usersRepository.findUserByUserEmailIgnoreCase(email).get(); - } - @Override public Integer edit(UserDto userDto) { - Users user = this.usersRepository.findUserByUserEmailIgnoreCase(userDto.getEmail()).get(); + UsersLoadingDto user = this.usersRepository.findUsersByUserEmailIgnoreCaseDto(userDto.getEmail()); return this.usersRepository.edit( userDto.getId(), @@ -67,6 +34,6 @@ @Override - public Users findUserByResetToken(String token) { - return this.usersRepository.findUserByResetToken("'"+token+"'").get(); + public UsersLoadingDto findUserByResetToken(String token) { + return this.usersRepository.findUserByResetToken(token); } @@ -77,6 +44,11 @@ @Override - public Integer deleteUserById(Long id) { - return 0; + public UsersLoadingDto findFullUserDtoByEmail(String userEmail) { + return this.usersRepository.findUsersByUserEmailIgnoreCaseDto(userEmail); + } + + @Override + public void deleteUserById(Long id) { + this.usersRepository.delete(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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -4,10 +4,8 @@ import mk.ukim.finki.db.distributorapp.model.dto.VehicleBasicDto; import mk.ukim.finki.db.distributorapp.model.dto.VehicleDto; -import mk.ukim.finki.db.distributorapp.model.entities.Vehicle; import mk.ukim.finki.db.distributorapp.repository.VehicleRepository; import mk.ukim.finki.db.distributorapp.service.VehicleService; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; @@ -17,41 +15,4 @@ private final VehicleRepository vehicleRepository; - - private VehicleDto buildDto(Vehicle veh) { - return new VehicleDto( - veh.getVehicleId(), - veh.getVehicleCarryWeight(), - veh.getVehicleServiceInterval(), - veh.getVehicleKilometers(), - veh.getVehicleLastService(), - veh.getVehicleLastServiceKm(), - veh.getVehiclePlate(), - veh.getVehicleVin(), - veh.getVehicleRegDate(), - veh.getWarehouse().getWarehouseId(), - veh.getWarehouse().getCity().getCityName(), - veh.getWarehouse().getCity().getRegion().getRegionName(), - veh.getDriver().getUserId(), - veh.getDriver().getUsername(), - veh.getDriver().getUserEmail(), - veh.getDriver().getUserMobile(), - veh.getDriver().getUserImage() - ); - } - - private List buildDtoList(List vehicles) { - List dtos = new ArrayList<>(); - for (Vehicle veh : vehicles) { - VehicleDto dto = buildDto(veh); - dtos.add(dto); - } - return dtos; - } - - @Override - public List getAllVehicles() { - List vehicles = this.vehicleRepository.listAll(); - return buildDtoList(vehicles); - } @Override 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -2,8 +2,6 @@ import lombok.RequiredArgsConstructor; -import mk.ukim.finki.db.distributorapp.model.dto.ArticleUnitDto; import mk.ukim.finki.db.distributorapp.model.dto.WarehouseDto; import mk.ukim.finki.db.distributorapp.model.dto.WarehouseInventoryDto; -import mk.ukim.finki.db.distributorapp.model.entities.City; import mk.ukim.finki.db.distributorapp.model.entities.Warehouse; import mk.ukim.finki.db.distributorapp.repository.WarehouseRepository; @@ -11,5 +9,4 @@ import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; @@ -18,32 +15,4 @@ public class WarehouseServiceImpl implements WarehouseService { private final WarehouseRepository warehouseRepository; - - private List buildDtoList(List warehouses) { - List dtos = new ArrayList<>(); - for (Warehouse wh : warehouses) { - WarehouseDto dto = new WarehouseDto( - wh.getWarehouseId(), - wh.getWarehouseAddress(), - wh.getCity().getCityId(), - wh.getCity().getCityName(), - wh.getCity().getRegion().getRegionId(), - wh.getCity().getRegion().getRegionName() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List getAllWarehouses() { - List warehouses = this.warehouseRepository.findAll(); - return buildDtoList(warehouses); - } - - @Override - public List findAllByCity(City city) { - List warehouses = this.warehouseRepository.findAllByCity(city.getCityId()); - return buildDtoList(warehouses); - } @Override 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WeekdayServiceImpl.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -3,11 +3,7 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.db.distributorapp.model.dto.WeekdayDto; -import mk.ukim.finki.db.distributorapp.model.entities.Weekday; 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 @@ -15,40 +11,4 @@ public class WeekdayServiceImpl implements WeekdayService { private final WeekdayRepository weekdayRepository; - - private List buildDto(List weekdays) { - List dtos = new ArrayList<>(); - for (Weekday weekday : weekdays) { - WeekdayDto dto = new WeekdayDto( - weekday.getId(), - weekday.getDayName() - ); - dtos.add(dto); - } - return dtos; - } - - @Override - public List getAllWeekdays() { - List weekdays = this.weekdayRepository.listAll(); - return buildDto(weekdays); - } - - @Override - public WeekdayDto getWeekdayByName(String weekdayName) { - Weekday weekday = this.weekdayRepository.findWeekdayByName("'"+weekdayName+"'").get(); - return new WeekdayDto( - weekday.getId(), - weekday.getDayName() - ); - } - - @Override - public WeekdayDto findWeekdayById(Short id) { - Weekday weekday = this.weekdayRepository.findWeekdayById(id).get(); - return new WeekdayDto( - weekday.getId(), - weekday.getDayName() - ); - } @Override Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/AdminController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/AdminController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/AdminController.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -97,5 +97,4 @@ } - // WAREHOUSE CONTROLS: 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -29,5 +29,4 @@ private final ArticleUnitService articleUnitService; private final ManufacturerService manufacturerService; - private final ProFormaService proFormaService; @GetMapping({"/dashboard", "/"}) @@ -36,4 +35,5 @@ String userEmail = authentication.getName(); UserDto user = this.usersService.findUserDtoByEmail(userEmail); + CustomerDto customer = this.customerService.findCustomerById(user.getId()); model.addAttribute("customer", customer); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/HomeController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/HomeController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/HomeController.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -15,7 +15,5 @@ @RequestMapping({"/","/home"}) public class HomeController { - private final UsersService usersService; - @GetMapping 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 c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -21,6 +21,4 @@ @RequiredArgsConstructor public class ManagerController { - private final ManagerService managerService; - private final UsersService usersService; private final VehicleService vehicleService; @@ -28,5 +26,4 @@ private final WarehouseService warehouseService; private final DeliveryService deliveryService; - @GetMapping({"/dashboard","/"}) Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestArticleController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestArticleController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,44 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.ArticleDto; -import mk.ukim.finki.db.distributorapp.service.ArticleService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@CrossOrigin(origins = "http://localhost:4200") -@RequestMapping("/rest/article") -public class RestArticleController { - private final ArticleService articleService; - - public RestArticleController(ArticleService articleService) { - this.articleService = articleService; - } - - @GetMapping("/all") - ResponseEntity> getAllArticlesDto() { - List articles = articleService.getAllArticles(); - return ResponseEntity.ok(articles); - } - - @PutMapping("/add") - ResponseEntity addArticle(@RequestBody ArticleDto articleDto) { - Integer res = this.articleService.create(articleDto); - - return ResponseEntity.ok(res); - } - - @PutMapping("/edit") - ResponseEntity editArticle(@RequestBody ArticleDto articleDto) { - Integer res = this.articleService.editById(articleDto); - return ResponseEntity.ok(res); } - - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteArticle(@PathVariable Long id) { - this.articleService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestArticleUnitController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestArticleUnitController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,43 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.ArticleUnitDto; -import mk.ukim.finki.db.distributorapp.model.dto.ArticleUnitSimpleDto; -import mk.ukim.finki.db.distributorapp.service.ArticleUnitService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/restarticleUnit") -public class RestArticleUnitController { - private final ArticleUnitService articleUnitService; - - public RestArticleUnitController(ArticleUnitService articleUnitService) { - this.articleUnitService = articleUnitService; - } - - @GetMapping("/all") - public ResponseEntity> getAllUnits() { - List units = this.articleUnitService.getAllArticleUnits(); - return ResponseEntity.ok(units); - } - - @PutMapping("/add") - public ResponseEntity addUnit(@RequestBody ArticleUnitDto articleUnitDto) { - Integer result = this.articleUnitService.create(articleUnitDto); - return ResponseEntity.ok(result); - } - - @PutMapping("edit") - public ResponseEntity editUnit(@RequestBody ArticleUnitDto articleUnitDto) { - Integer result = this.articleUnitService.edit(articleUnitDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteUnit(@PathVariable Long id) { - this.articleUnitService.delete(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCategoryController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCategoryController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.CategoryDto; -import mk.ukim.finki.db.distributorapp.service.CategoryService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/category") -public class RestCategoryController { - private final CategoryService categoryService; - - public RestCategoryController(CategoryService categoryService) { - this.categoryService = categoryService; - } - - @GetMapping("/all") - public ResponseEntity> getAllCategoriesDto() { - List categoryDtos = this.categoryService.listCategories(); - return ResponseEntity.ok(categoryDtos); - } - - @PutMapping("/add") - public ResponseEntity addCategory(@RequestBody CategoryDto categoryDto) { - Integer result = this.categoryService.create(categoryDto); - return ResponseEntity.ok(result); - } - - @PutMapping("edit") - public ResponseEntity editCategory(@RequestBody CategoryDto categoryDto) { - Integer result = this.categoryService.edit(categoryDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteCategory(@PathVariable Integer id) { - this.categoryService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCityController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCityController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,43 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.CityDto; -import mk.ukim.finki.db.distributorapp.service.CityService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/city") -public class RestCityController { - private final CityService cityService; - - public RestCityController(CityService cityService) { - this.cityService = cityService; - } - - @GetMapping("/all") - public ResponseEntity> getAllCities() { - List cities = this.cityService.listCities(); - return ResponseEntity.ok(cities); - } - - @PutMapping("/add") - public ResponseEntity addCity(@RequestBody CityDto CityDto) { - Integer result = this.cityService.create(CityDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editCity(@RequestBody CityDto CityDto) { - Integer result = this.cityService.edit(CityDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteCity(@PathVariable Integer id) { - this.cityService.deleteById(id); - return new ResponseEntity<>(HttpStatus.OK); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCustomerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCustomerController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,43 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.CustomerDto; -import mk.ukim.finki.db.distributorapp.service.CustomerService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/customer") -public class RestCustomerController { - - private final CustomerService customerService; - - public RestCustomerController(CustomerService customerService) { - this.customerService = customerService; - } - - @GetMapping("/all") - public ResponseEntity> getAllCustomers() { - List result = customerService.findAllCustomers(); - return ResponseEntity.ok(result); - } - - @PutMapping("/add") - public ResponseEntity addCustomer(@RequestBody CustomerDto customerDto) { - Integer result = this.customerService.create(customerDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editCustomer(@RequestBody CustomerDto customerDto) { - Integer result = this.customerService.edit(customerDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteCustomer(@PathVariable Long id) { - this.customerService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCustomerWeekdayController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestCustomerWeekdayController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,28 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.CustomerWeekdayDto; -import mk.ukim.finki.db.distributorapp.service.CustomerWeekdayService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping("/rest/customerWeekday") -public class RestCustomerWeekdayController { - private final CustomerWeekdayService customerWeekdayService; - - public RestCustomerWeekdayController(CustomerWeekdayService customerWeekdayService) { - this.customerWeekdayService = customerWeekdayService; - } - - @GetMapping("/all") - public ResponseEntity> getAllWeekdays(){ - List weekdays = customerWeekdayService.getAllWeekdays(); - return ResponseEntity.ok(weekdays); - } - - -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,44 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.DeliveryCreateDto; -import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; -import mk.ukim.finki.db.distributorapp.model.dto.DeliveryFullDto; -import mk.ukim.finki.db.distributorapp.service.DeliveryService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/delivery") -public class RestDeliveryController { - private final DeliveryService deliveryService; - - public RestDeliveryController(DeliveryService deliveryService) { - this.deliveryService = deliveryService; - } - - @GetMapping("/all") - public ResponseEntity> getAllDeliveries() { - List deliveries = deliveryService.getAllDeliveries(); - return ResponseEntity.ok(deliveries); - } - - @PutMapping("/add") - public ResponseEntity addDelivery(@RequestBody DeliveryCreateDto DeliveryDto) { - Integer result = this.deliveryService.create(DeliveryDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editDelivery(@RequestBody DeliveryFullDto DeliveryDto) { - Integer result = this.deliveryService.edit(DeliveryDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteDelivery(@PathVariable Long id) { - this.deliveryService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryStatusController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryStatusController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.DeliveryStatusDto; -import mk.ukim.finki.db.distributorapp.service.DeliveryStatusService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/dStatus") -public class RestDeliveryStatusController { - private final DeliveryStatusService deliveryStatusService; - - public RestDeliveryStatusController(DeliveryStatusService deliveryStatusService) { - this.deliveryStatusService = deliveryStatusService; - } - - @GetMapping("/all") - public ResponseEntity> getAllDeliveryStatus() { - List statuses = this.deliveryStatusService.getAllDeliveryStatus(); - return ResponseEntity.ok(statuses); - } - - @PutMapping("/add") - public ResponseEntity addDeliveryStatus(@RequestBody DeliveryStatusDto DeliveryStatusDto) { - Integer result = this.deliveryStatusService.create(DeliveryStatusDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editDeliveryStatus(@RequestBody DeliveryStatusDto DeliveryStatusDto) { - Integer result = this.deliveryStatusService.edit(DeliveryStatusDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteDeliveryStatus(@PathVariable Short id) { - this.deliveryStatusService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDriverController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDriverController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,43 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.DriverDto; -import mk.ukim.finki.db.distributorapp.service.DriverService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/driver") -public class RestDriverController { - private final DriverService driverService; - - public RestDriverController(DriverService driverService) { - this.driverService = driverService; - } - - @GetMapping("/all") - public ResponseEntity> getAllDrivers() { - List drivers = driverService.getAllDrivers(); - return ResponseEntity.ok(drivers); - } - - - @PutMapping("/add") - public ResponseEntity addDriver(@RequestBody DriverDto driverDto) { - Integer result = this.driverService.create(driverDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editDriver(@RequestBody DriverDto driverDto) { - Integer result = this.driverService.edit(driverDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteDriver(@PathVariable Long id) { - this.driverService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestManagerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestManagerController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,47 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.ManagerDto; -import mk.ukim.finki.db.distributorapp.service.ManagerService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/manager") -public class RestManagerController { - private final ManagerService managerService; - - public RestManagerController(ManagerService managerService) { - this.managerService = managerService; - } - - @GetMapping("/all") - public ResponseEntity> getAllManagers() { - List managers = managerService.getAllManagers(); - return ResponseEntity.ok(managers); - } - - @GetMapping("/add") - public String addManager() { - return "create-manager"; - } - - @PutMapping("/add") - public ResponseEntity addManager(@RequestBody ManagerDto ManagerDto) { - Integer result = this.managerService.create(ManagerDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editManager(@RequestBody ManagerDto ManagerDto) { - Integer result = this.managerService.edit(ManagerDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteManager(@PathVariable Long id) { - this.managerService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestManufacturerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestManufacturerController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.ManufacturerDto; -import mk.ukim.finki.db.distributorapp.service.ManufacturerService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/manufacturer") -public class RestManufacturerController { - private final ManufacturerService manufacturerService; - - public RestManufacturerController(ManufacturerService manufacturerService) { - this.manufacturerService = manufacturerService; - } - - @GetMapping("/all") - public ResponseEntity> getAllManufacturers() { - List manufacturers = manufacturerService.getAllManufacturers(); - return ResponseEntity.ok(manufacturers); - } - - @PutMapping("/add") - public ResponseEntity addManufacturer(@RequestBody ManufacturerDto ManufacturerDto) { - Integer result = this.manufacturerService.create(ManufacturerDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editManufacturer(@RequestBody ManufacturerDto ManufacturerDto) { - Integer result = this.manufacturerService.edit(ManufacturerDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteManufacturer(@PathVariable Long id) { - this.manufacturerService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestOrderStatusController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestOrderStatusController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.OrderStatusDto; -import mk.ukim.finki.db.distributorapp.service.OrderStatusService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/oStatus") -public class RestOrderStatusController { - private final OrderStatusService orderStatusService; - - public RestOrderStatusController(OrderStatusService orderStatusService) { - this.orderStatusService = orderStatusService; - } - - @GetMapping("/all") - public ResponseEntity> getAllOrderStatus() { - List statuses = this.orderStatusService.getAllOrderStatus(); - return ResponseEntity.ok(statuses); - } - - @PutMapping("/add") - public ResponseEntity addOrderStatus(@RequestBody OrderStatusDto OrderStatusDto) { - Integer result = this.orderStatusService.create(OrderStatusDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editOrderStatus(@RequestBody OrderStatusDto OrderStatusDto) { - Integer result = this.orderStatusService.edit(OrderStatusDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteOrderStatus(@PathVariable Short id) { - this.orderStatusService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestOrdersController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestOrdersController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,37 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.OrdersDto; -import mk.ukim.finki.db.distributorapp.service.OrdersService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/order") -public class RestOrdersController { - private final OrdersService OrderService; - - public RestOrdersController(OrdersService orderService) { - OrderService = orderService; - } - - - @GetMapping("/all") - public ResponseEntity> getAllOrders() { - List orders = OrderService.getAllOrders(); - return ResponseEntity.ok(orders); - } - - @PutMapping("/edit") - public ResponseEntity editOrders(@RequestBody OrdersDto OrdersDto) { - Integer result =this.OrderService.edit(OrdersDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteOrders(@PathVariable Long id) { - this.OrderService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestPriceController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestPriceController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.PriceDto; -import mk.ukim.finki.db.distributorapp.service.PriceService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/price") -public class RestPriceController { - private final PriceService priceService; - - public RestPriceController(PriceService priceService) { - this.priceService = priceService; - } - - @GetMapping("/all") - public ResponseEntity> getAllPrices() { - List prices = this.priceService.getAllPrices(); - return ResponseEntity.ok(prices); - } - - @PutMapping("/add") - public ResponseEntity addPrice(@RequestBody PriceDto PriceDto) { - Integer result = this.priceService.create(PriceDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editPrice(@RequestBody PriceDto PriceDto) { - Integer result = this.priceService.edit(PriceDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deletePrice(@PathVariable Integer id) { - this.priceService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestProFormaController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestProFormaController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.ProFormaDto; -import mk.ukim.finki.db.distributorapp.service.ProFormaService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/pForma") -public class RestProFormaController { - private final ProFormaService proFormaService; - - public RestProFormaController(ProFormaService proFormaService) { - this.proFormaService = proFormaService; - } - - @GetMapping("/all") - public ResponseEntity> getAllProFormas() { - List proFormas = this.proFormaService.getAllProForma(); - return ResponseEntity.ok(proFormas); - } - - @PutMapping("/add") - public ResponseEntity addProForma(@RequestBody ProFormaDto ProFormaDto) { - Integer result = this.proFormaService.create(ProFormaDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editProForma(@RequestBody ProFormaDto ProFormaDto) { - Integer result = this.proFormaService.edit(ProFormaDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteProForma(@PathVariable Long id) { - this.proFormaService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestProFormaStatusController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestProFormaStatusController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.ProFormaStatusDto; -import mk.ukim.finki.db.distributorapp.service.ProFormaStatusService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/pfStatus") -public class RestProFormaStatusController { - private final ProFormaStatusService proFormaStatusService; - - public RestProFormaStatusController(ProFormaStatusService proFormaStatusService) { - this.proFormaStatusService = proFormaStatusService; - } - - @GetMapping("/all") - public ResponseEntity> getAllProFormaStatuss() { - List statuses = proFormaStatusService.getAllProFormaStatus(); - return ResponseEntity.ok(statuses); - } - - @PutMapping("/add") - public ResponseEntity addProFormaStatus(@RequestBody ProFormaStatusDto ProFormaStatusDto) { - Integer result = this.proFormaStatusService.create(ProFormaStatusDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editProFormaStatus(@RequestBody ProFormaStatusDto ProFormaStatusDto) { - Integer result = this.proFormaStatusService.edit(ProFormaStatusDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteProFormaStatus(@PathVariable Short id) { - this.proFormaStatusService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestRegionController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestRegionController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.RegionDto; -import mk.ukim.finki.db.distributorapp.service.RegionService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/region") -public class RestRegionController { - private final RegionService regionService; - - public RestRegionController(RegionService regionService) { - this.regionService = regionService; - } - - @GetMapping("/all") - public ResponseEntity> getAllRegions() { - List regions = this.regionService.getAllRegions(); - return ResponseEntity.ok(regions); - } - - @PutMapping("/add") - public ResponseEntity addRegion(@RequestBody RegionDto RegionDto) { - Integer result = this.regionService.create(RegionDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editRegion(@RequestBody RegionDto RegionDto) { - Integer result = this.regionService.edit(RegionDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteRegion(@PathVariable Integer id) { - this.regionService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestUsersController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestUsersController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,52 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.UserDto; -import mk.ukim.finki.db.distributorapp.model.entities.Users; -import mk.ukim.finki.db.distributorapp.service.UsersService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - -@RestController() -@RequestMapping("/rest/users") -public class RestUsersController { - - private final UsersService usersService; - - public RestUsersController(UsersService usersService) { - this.usersService = usersService; - } - - private List buildDto(List users) { - List dtos = new ArrayList<>(); - for (Users user : users) { - UserDto dto = new UserDto( - user.getUserId(), - user.getUsername(), - user.getUserSurname(), - user.getUserEmail(), - user.getUserMobile(), - user.getUserImage(), - user.getCity().getCityId(), - user.getCity().getCityName(), - user.getCity().getRegion().getRegionName(), - user.getUserRole().toString(), - user.getClazz_(), - user.getUserActive() - ); - dtos.add(dto); - } - return dtos; - } - - @GetMapping("/all") - public ResponseEntity> getAllUsers(){ - List users = this.usersService.findAllUsers(); - return ResponseEntity.ok(buildDto(users)); - } - -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestVehicleController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestVehicleController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.VehicleDto; -import mk.ukim.finki.db.distributorapp.service.VehicleService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/vehicle") -public class RestVehicleController { - private final VehicleService vehicleService; - - public RestVehicleController(VehicleService vehicleService) { - this.vehicleService = vehicleService; - } - - @GetMapping("/all") - public ResponseEntity> getAllVehicles() { - List vehicles = vehicleService.getAllVehicles(); - return ResponseEntity.ok(vehicles); - } - - @PutMapping("/add") - public ResponseEntity addVehicle(@RequestBody VehicleDto VehicleDto) { - Integer result = this.vehicleService.create(VehicleDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editVehicle(@RequestBody VehicleDto VehicleDto) { - Integer result = this.vehicleService.edit(VehicleDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteVehicle(@PathVariable Integer id) { - this.vehicleService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestWarehouseController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestWarehouseController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.WarehouseDto; -import mk.ukim.finki.db.distributorapp.service.WarehouseService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/warehouse") -public class RestWarehouseController { - private final WarehouseService warehouseService; - - public RestWarehouseController(WarehouseService warehouseService) { - this.warehouseService = warehouseService; - } - - @GetMapping("/all") - public ResponseEntity> getAllWarehouses() { - List warehouses = this.warehouseService.getAllWarehouses(); - return ResponseEntity.ok(warehouses); - } - - @PutMapping("/add") - public ResponseEntity addWarehouse(@RequestBody WarehouseDto WarehouseDto) { - Integer result = this.warehouseService.create(WarehouseDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editWarehouse(@RequestBody WarehouseDto WarehouseDto) { - Integer result = this.warehouseService.edit(WarehouseDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteWarehouse(@PathVariable Integer id) { - this.warehouseService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestWeekdayController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestWeekdayController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ (revision ) @@ -1,42 +1,0 @@ -package mk.ukim.finki.db.distributorapp.web.rest; - -import mk.ukim.finki.db.distributorapp.model.dto.WeekdayDto; -import mk.ukim.finki.db.distributorapp.service.WeekdayService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/rest/weekday") -public class RestWeekdayController { - private final WeekdayService weekdayService; - - public RestWeekdayController(WeekdayService weekdayService) { - this.weekdayService = weekdayService; - } - - @GetMapping("/all") - public ResponseEntity> getAllWeekdays(){ - List weekdays = weekdayService.getAllWeekdays(); - return ResponseEntity.ok(weekdays); - } - - @PutMapping("/add") - public ResponseEntity addWeekday(@RequestBody WeekdayDto weekdayDto){ - Integer result = this.weekdayService.create(weekdayDto); - return ResponseEntity.ok(result); - } - - @PutMapping("/edit") - public ResponseEntity editWeekday(@RequestBody WeekdayDto weekdayDto){ - Integer result = this.weekdayService.edit(weekdayDto); - return ResponseEntity.ok(result); - } - - @DeleteMapping("/delete/{id}") - public ResponseEntity deleteWeekday(@PathVariable Short id){ - this.weekdayService.deleteById(id); - return ResponseEntity.noContent().build(); - } -} Index: backend/src/main/resources/application.properties =================================================================== --- backend/src/main/resources/application.properties (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/resources/application.properties (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -1,3 +1,3 @@ spring.application.name=DistributorApp -spring.profiles.active=test +spring.profiles.active=prod Index: backend/src/main/resources/templates/fragments/navbar.html =================================================================== --- backend/src/main/resources/templates/fragments/navbar.html (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/resources/templates/fragments/navbar.html (revision 749b5214991c9095b77445ae1464759ca4e0957f) @@ -42,7 +42,4 @@ Home -
  • - Start a delivery -