[Orders] After changing tariff the price of paid order is not changing

dao/src/main/java/greencity/entity/order/Bag.java

@@ -1,15 +1,26 @@
 package greencity.entity.order;
 
 import greencity.entity.user.employee.Employee;
+import greencity.enums.BagStatus;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.Builder;
-
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.CascadeType;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.time.LocalDate;
@@ -76,7 +87,12 @@ public class Bag {
     @JoinColumn
     private Employee editedBy;
 
-    @ManyToOne
+    @ManyToOne(cascade = CascadeType.REMOVE,
+        fetch = FetchType.EAGER)
     @JoinColumn(nullable = false)
     private TariffsInfo tariffsInfo;
+
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private BagStatus status;
 }

dao/src/main/java/greencity/entity/order/Order.java

@@ -1,21 +1,43 @@
 package greencity.entity.order;
 
-import greencity.enums.CancellationReason;
-import greencity.enums.OrderPaymentStatus;
-import greencity.enums.OrderStatus;
 import greencity.entity.notifications.UserNotification;
 import greencity.entity.user.User;
 import greencity.entity.user.employee.Employee;
 import greencity.entity.user.employee.EmployeeOrderPosition;
 import greencity.entity.user.employee.ReceivingStation;
 import greencity.entity.user.ubs.UBSuser;
+import greencity.enums.CancellationReason;
+import greencity.enums.OrderPaymentStatus;
+import greencity.enums.OrderStatus;
 import greencity.filters.StringListConverter;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.annotations.Cascade;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.MapKeyColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -28,10 +50,10 @@
 @Builder
 @Table(name = "orders")
 @EqualsAndHashCode(exclude = {"employeeOrderPositions", "userNotifications", "ubsUser",
-    "changeOfPointsList", "blockedByEmployee", "certificates", "attachedEmployees", "payment", "employeeOrderPositions",
+    "changeOfPointsList", "blockedByEmployee", "certificates", "payment", "employeeOrderPositions",
     "events", "imageReasonNotTakingBags", "additionalOrders"})
 @ToString(exclude = {"employeeOrderPositions", "userNotifications", "ubsUser",
-    "changeOfPointsList", "blockedByEmployee", "certificates", "attachedEmployees", "payment", "employeeOrderPositions",
+    "changeOfPointsList", "blockedByEmployee", "certificates", "payment", "employeeOrderPositions",
     "events", "imageReasonNotTakingBags", "additionalOrders"})
 public class Order {
     @Id
@@ -160,4 +182,10 @@ public class Order {
 
     @Column(name = "write_off_station_sum")
     private Long writeOffStationSum;
+
+    @OneToMany(
+        mappedBy = "order",
+        cascade = CascadeType.ALL,
+        orphanRemoval = true)
+    private List<OrderBag> orderBags = new ArrayList<>();
 }

dao/src/main/java/greencity/entity/order/OrderBag.java

@@ -0,0 +1,70 @@
+package greencity.entity.order;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(exclude = {"order", "bag"})
+@ToString(exclude = {"order", "bag"})
+@Getter
+@Setter
+@Builder
+@Table(name = "order_bag_mapping")
+public class OrderBag {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "order_id")
+    private Order order;
+
+    @ManyToOne(fetch = FetchType.EAGER)
+
+    @JoinColumn(name = "bag_id")
+    private Bag bag;
+
+    @Column(nullable = false)
+    private Integer amount;
+
+    @Column(name = "confirmed_quantity")
+    private Integer confirmedQuantity;
+
+    @Column(name = "exported_quantity")
+    private Integer exportedQuantity;
+
+    @Column(nullable = false)
+    private Integer capacity;
+
+    @Column(nullable = false)
+    private Long price;
+
+    @NotBlank
+    @Size(min = 1, max = 30)
+    @Column(nullable = false)
+    private String name;
+
+    @NotBlank
+    @Size(min = 1, max = 30)
+    @Column(nullable = false)
+    private String nameEng;
+}

dao/src/main/java/greencity/enums/BagStatus.java

@@ -0,0 +1,6 @@
+package greencity.enums;
+
+public enum BagStatus {
+    ACTIVE,
+    DELETED
+}

dao/src/main/java/greencity/repository/BagRepository.java

@@ -8,21 +8,10 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Repository
 public interface BagRepository extends JpaRepository<Bag, Integer> {
-    /**
-     * method, that returns {@link List}of{@link Bag} that have bags by order id.
-     *
-     * @param id order id
-     * @return {@link List}of{@link Bag} by it's language and orderId.
-     * @author Mahdziak Orest
-     */
-    @Query(value = "SELECT * FROM ORDER_BAG_MAPPING as OBM "
-        + "JOIN BAG AS B ON OBM.ORDER_ID = :orderId and OBM.BAG_ID = B.ID "
-        + "ORDER BY B.ID", nativeQuery = true)
-    List<Bag> findBagsByOrderId(@Param("orderId") Long id);
-
     /**
      * This is method which find capacity by id.
      * 
@@ -79,11 +68,26 @@ public interface BagRepository extends JpaRepository<Bag, Integer> {
     List<Bag> findAllByOrder(@Param("orderId") Long orderId);
 
     /**
-     * method, that returns {@link List} of {@link Bag} by tariff id.
+     * method, that returns {@link List} of {@link Bag} by id.
+     *
+     * @param bagId {@link Integer} tariff service id
+     * @return {@link Optional} of {@link Bag}
+     * @author Oksana Spodaryk
+     */
+    @Query(nativeQuery = true,
+        value = "SELECT * FROM bag "
+            + "WHERE id = :bagId AND status = 'ACTIVE'")
+    Optional<Bag> findActiveBagById(Integer bagId);
+
+    /**
+     * method, that returns {@link List} of active {@link Bag} by tariff id.
      *
-     * @param tariffInfoId tariff id {@link Long}
-     * @return {@link List} of {@link Bag} by tariffInfoId.
-     * @author Safarov Renat
+     * @param tariffInfoId {@link Long} tariff id
+     * @return {@link List} of {@link Bag}
+     * @author Oksana Spodaryk
      */
-    List<Bag> findBagsByTariffsInfoId(Long tariffInfoId);
+    @Query(nativeQuery = true,
+        value = "SELECT * FROM bag "
+            + "WHERE tariffs_info_id = :tariffInfoId AND status = 'ACTIVE'")
+    List<Bag> findAllActiveBagsByTariffsInfoId(Long tariffInfoId);
 }

dao/src/main/java/greencity/repository/OrderBagRepository.java

@@ -0,0 +1,73 @@
+package greencity.repository;
+
+import greencity.entity.order.OrderBag;
+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.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Repository
+public interface OrderBagRepository extends JpaRepository<OrderBag, Long> {
+    /**
+     * Deletes the OrderBag from the ORDER_BAG_MAPPING table where the bagId and
+     * orderId match the provided values.
+     *
+     * @param bagId   The ID of the bag to be deleted.
+     * @param orderId The ID of the order to which the bag is associated.
+     */
+    @Transactional
+    @Modifying
+    @Query(value = "DELETE FROM ORDER_BAG_MAPPING WHERE BAG_ID = :bagId AND ORDER_ID = :orderId", nativeQuery = true)
+    void deleteOrderBagByBagIdAndOrderId(@Param("bagId") Integer bagId, @Param("orderId") Long orderId);
+
+    /**
+     * Retrieves a list of order bags based on the given bag ID.
+     *
+     * @param id the ID of the order
+     * @return a list of order bags matching the bag ID
+     */
+    @Query(value = "SELECT   * FROM ORDER_BAG_MAPPING as OBM "
+        + "where OBM.BAG_ID = :bagId", nativeQuery = true)
+    List<OrderBag> findOrderBagsByBagId(@Param("bagId") Integer id);
+
+    /**
+     * Retrieves a list of order bags based on the given order ID.
+     *
+     * @param id the ID of the order
+     * @return a list of order bags matching the order ID
+     */
+    @Query(value = "SELECT   * FROM ORDER_BAG_MAPPING as OBM "
+        + "where OBM.ORDER_ID = :orderId", nativeQuery = true)
+    List<OrderBag> findOrderBagsByOrderId(@Param("orderId") Long id);
+
+    /**
+     * method updates the bag data of OrderBag for all unpaid orders.
+     *
+     * @param bagId    {@link Integer} bag id
+     * @param capacity {@link Integer} bag capacity
+     * @param price    {@link Long} bag full price in coins
+     * @param name     {@link String} bag name
+     * @param nameEng  {@link String} bag english name
+     * @author Oksana Spodaryk
+     */
+    @Transactional
+    @Modifying
+    @Query(value = "update order_bag_mapping obm "
+        + "set capacity = :capacity, price = :price, name = :name, name_eng = :nameEng "
+        + "from orders o "
+        + "where o.id = obm.order_id and obm.bag_id = :bagId and o.order_payment_status = 'UNPAID'", nativeQuery = true)
+    void updateAllByBagIdForUnpaidOrders(Integer bagId, Integer capacity, Long price, String name, String nameEng);
+
+    /**
+     * method returns all OrderBags by bag id.
+     *
+     * @param bagId {@link Integer} bag id
+     * @return {@link List} of {@link OrderBag}
+     * @author Julia Seti
+     */
+    List<OrderBag> findAllByBagId(Integer bagId);
+}

dao/src/main/java/greencity/repository/OrderRepository.java

@@ -251,4 +251,22 @@ void changeReceivingStationForAllOrders(@Param("receiving_station") Long station
     void updateOrderStatusToExpected(@Param("actual_status") String actualStatus,
         @Param("expected_status") String expectedStatus,
         @Param("currentDate") LocalDate currentDate);
+
+    /**
+     * method returns all unpaid orders that contain a bag with id.
+     */
+    @Query(nativeQuery = true,
+        value = "select * from orders o "
+            + "left join order_bag_mapping obm on o.id = obm.order_id "
+            + "where obm.bag_id = :bagId and o.order_payment_status = 'UNPAID'")
+    List<Order> findAllUnpaidOrdersByBagId(Integer bagId);
+
+    /**
+     * method returns all orders that contain a bag with id.
+     */
+    @Query(nativeQuery = true,
+        value = "select * from orders o "
+            + "left join order_bag_mapping obm on o.id = obm.order_id "
+            + "where obm.bag_id = :bagId")
+    List<Order> findAllByBagId(Integer bagId);
 }

dao/src/main/resources/db/changelog/db.changelog-master.xml

@@ -207,11 +207,14 @@
     <include file="db/changelog/logs/ch-update-service-price-Seti.xml"/>
     <include file="db/changelog/logs/ch-update_big_order_table_view-Seti.xml"/>
     <include file="/db/changelog/logs/ch-modify-columns-name-name-eng-in-bag-and-service-tables.xml"/>
+    <include file="/db/changelog/logs/ch-add-column-order-bag-mapping-table-Spodaryk.xml"/>
     <include file="/db/changelog/logs/ch-add-column-position-Spodaryk.xml"/>
     <include file="/db/changelog/logs/ch-add-column-employee_filter_view-Spodaryk.xml"/>
     <include file="/db/changelog/logs/ch-modify-columns-house-number-in-tables-address-and-order-address.xml"/>
     <include file="/db/changelog/logs/ch-upd-notification-platforms-body-body_eng-Lenets.xml"/>
     <include file="/db/changelog/logs/ch-update_big_order_table_view-with-bags-sorting-Lenets.xml"/>
     <include file="/db/changelog/logs/ch-upd-notification-templates-titles-Lenets.xml"/>
     <include file="db/changelog/logs/ch-add-table-refunds-Bondar.xml"/>
+    <include file="db/changelog/logs/ch-add-column-status-to-bag-table-Spodaryk.xml"/>
+    <include file="/db/changelog/logs/ch-update-order-bag-mapping-table-Spodaryk.xml"/>
 </databaseChangeLog>