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

… changing (#1196)" (#1199)

This reverts commit c020a53.

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

@@ -9,15 +9,7 @@
 import lombok.ToString;
 import lombok.Builder;
 
-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.*;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.time.LocalDate;
@@ -84,7 +76,7 @@ public class Bag {
     @JoinColumn
     private Employee editedBy;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne
     @JoinColumn(nullable = false)
     private TariffsInfo tariffsInfo;
 }

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

@@ -1,43 +1,21 @@
 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.AllArgsConstructor;
-import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 import org.hibernate.annotations.Cascade;
 
-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 javax.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -50,10 +28,10 @@
 @Builder
 @Table(name = "orders")
 @EqualsAndHashCode(exclude = {"employeeOrderPositions", "userNotifications", "ubsUser",
-    "changeOfPointsList", "blockedByEmployee", "certificates", "payment", "employeeOrderPositions",
+    "changeOfPointsList", "blockedByEmployee", "certificates", "attachedEmployees", "payment", "employeeOrderPositions",
     "events", "imageReasonNotTakingBags", "additionalOrders"})
 @ToString(exclude = {"employeeOrderPositions", "userNotifications", "ubsUser",
-    "changeOfPointsList", "blockedByEmployee", "certificates", "payment", "employeeOrderPositions",
+    "changeOfPointsList", "blockedByEmployee", "certificates", "attachedEmployees", "payment", "employeeOrderPositions",
     "events", "imageReasonNotTakingBags", "additionalOrders"})
 public class Order {
     @Id
@@ -182,10 +160,4 @@ 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/repository/BagRepository.java

@@ -11,6 +11,18 @@
 
 @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.
      * 

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

@@ -251,22 +251,4 @@ 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,7 +207,6 @@
     <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-update-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"/>

service/src/main/java/greencity/mapping/bag/BagForUserDtoMapper.java

@@ -2,21 +2,21 @@
 
 import greencity.constant.AppConstant;
 import greencity.dto.bag.BagForUserDto;
-import greencity.entity.order.OrderBag;
+import greencity.entity.order.Bag;
 import org.modelmapper.AbstractConverter;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 
 @Component
-public class BagForUserDtoMapper extends AbstractConverter<OrderBag, BagForUserDto> {
+public class BagForUserDtoMapper extends AbstractConverter<Bag, BagForUserDto> {
     @Override
-    protected BagForUserDto convert(OrderBag source) {
+    protected BagForUserDto convert(Bag source) {
         return BagForUserDto.builder()
             .service(source.getName())
             .serviceEng(source.getNameEng())
             .capacity(source.getCapacity())
-            .fullPrice(BigDecimal.valueOf(source.getPrice())
+            .fullPrice(BigDecimal.valueOf(source.getFullPrice())
                 .movePointLeft(AppConstant.TWO_DECIMALS_AFTER_POINT_IN_CURRENCY)
                 .doubleValue())
             .build();