FIXING : Fixing Generated Value, Sequence Generator and application.properties

.gitignore

@@ -2,3 +2,5 @@
 mvnw
 mvnw.cmd
 Dockerfile
+*.lst
+target/

src/main/java/com/eksad/masterdata/domain/ComplaintWorkOrder.java → src/main/java/com/eksad/masterdata/domain/workorder/ComplaintWorkOrder.java

-package com.eksad.masterdata.domain;
+package com.eksad.masterdata.domain.workorder;
 
 import com.eksad.ddms.common.util.object.EntityObject;
 
+import com.eksad.masterdata.domain.CreationalSpecification;
 import jakarta.persistence.*;
+
 import java.util.Objects;
 
 @Entity
@@ -10,8 +12,8 @@ import java.util.Objects;
 public class ComplaintWorkOrder implements EntityObject<ComplaintWorkOrder> {
 
     @Id
-    @GeneratedValue(generator = "trx_complaintwo_gen")
-    @SequenceGenerator(name = "trx_complaintwo_gen", sequenceName = "trx_complaintwo_seq")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trx_complaintwo_gen")
+    @SequenceGenerator(name = "trx_complaintwo_gen", sequenceName = "trx_complaintwo_seq", allocationSize = 1)
     Integer id;
     private String complaintWoID;
     private String complaintID;

src/main/java/com/eksad/masterdata/domain/PromoWorkOrder.java → src/main/java/com/eksad/masterdata/domain/workorder/PromoWorkOrder.java

-package com.eksad.masterdata.domain;
+package com.eksad.masterdata.domain.workorder;
 
 import com.eksad.ddms.common.util.object.EntityObject;
 
+import com.eksad.masterdata.domain.CreationalSpecification;
 import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Objects;
@@ -12,7 +13,8 @@ import java.util.Set;
 public class PromoWorkOrder implements EntityObject<PromoWorkOrder> {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mst_promoworkorder_gen")
+    @SequenceGenerator(name = "mst_promoworkorder_gen", sequenceName = "mst_promoworkorder_seq", allocationSize = 1)
     Integer id;
 
     private String promoWoID;

src/main/java/com/eksad/masterdata/domain/PromoWorkOrderDetail.java → src/main/java/com/eksad/masterdata/domain/workorder/PromoWorkOrderDetail.java

-package com.eksad.masterdata.domain;
+package com.eksad.masterdata.domain.workorder;
 
 import com.eksad.ddms.common.type.PromoWOType;
 import com.eksad.ddms.common.util.object.EntityObject;
 import com.eksad.ddms.common.util.status.DataStatus;
 
+import com.eksad.masterdata.domain.CreationalSpecification;
 import jakarta.persistence.*;
 import java.util.Objects;
 
@@ -12,8 +13,8 @@ import java.util.Objects;
 public class PromoWorkOrderDetail implements EntityObject<PromoWorkOrderDetail> {
 
     @Id
-    @GeneratedValue(generator = "mst_promoworkorderdetail_gen")
-    @SequenceGenerator(name = "mst_promoworkorderdetail_gen", sequenceName = "mst_promoworkorderdetail_seq")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mst_promoworkorderdetail_gen")
+    @SequenceGenerator(name = "mst_promoworkorderdetail_gen", sequenceName = "mst_promoworkorderdetail_seq", allocationSize = 1)
     Integer id;
 
     private String promoWoID;

src/main/java/com/eksad/masterdata/domain/WorkOrder.java → src/main/java/com/eksad/masterdata/domain/workorder/WorkOrder.java

-package com.eksad.masterdata.domain;
+package com.eksad.masterdata.domain.workorder;
 
 import com.eksad.ddms.common.h2.type.servicelocation.ServiceLocationType;
 import com.eksad.ddms.common.type.*;
 import com.eksad.ddms.common.util.object.EntityObject;
 
+import com.eksad.masterdata.domain.CreationalSpecification;
 import jakarta.persistence.*;
 
 import javax.validation.constraints.NotNull;
@@ -18,8 +19,8 @@ import java.util.Set;
 public class WorkOrder implements EntityObject<WorkOrder> {
 
     @Id
-    @GeneratedValue(generator = "trx_wo_gen")
-    @SequenceGenerator(name = "trx_wo_gen", sequenceName = "trx_wo_seq")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trx_wo_gen")
+    @SequenceGenerator(name = "trx_wo_gen", sequenceName = "trx_wo_seq", allocationSize = 1)
     Integer id;
 
     @Version

src/main/java/com/eksad/masterdata/domain/WorkOrderService.java → src/main/java/com/eksad/masterdata/domain/workorder/WorkOrderService.java

-package com.eksad.masterdata.domain;
+package com.eksad.masterdata.domain.workorder;
 
 import com.eksad.ddms.common.util.object.EntityObject;
 
+import com.eksad.masterdata.domain.CreationalSpecification;
 import jakarta.persistence.*;
 
 import javax.validation.constraints.NotNull;
@@ -12,8 +13,8 @@ import java.util.Objects;
 public class WorkOrderService implements EntityObject<WorkOrderService> {
 
     @Id
-    @GeneratedValue(generator = "trx_woservice_gen")
-    @SequenceGenerator(name = "trx_woservice_gen", sequenceName = "trx_woservice_seq")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trx_woservice_gen")
+    @SequenceGenerator(name = "trx_woservice_gen", sequenceName = "trx_woservice_seq", allocationSize = 1)
     Integer id;
 
     @NotNull(message="Work Order Service ID cannot be null")

src/main/java/com/eksad/masterdata/domain/WorkOrderSparepart.java → src/main/java/com/eksad/masterdata/domain/workorder/WorkOrderSparepart.java

-package com.eksad.masterdata.domain;
+package com.eksad.masterdata.domain.workorder;
 
 
 import com.eksad.ddms.common.util.object.EntityObject;
 
+import com.eksad.masterdata.domain.CreationalSpecification;
 import jakarta.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.util.Objects;
@@ -12,26 +13,37 @@ import java.util.Objects;
 public class WorkOrderSparepart implements EntityObject<WorkOrderSparepart> {
 
     @Id
-    @GeneratedValue(generator = "trx_wosparepart_gen")
-    @SequenceGenerator(name = "trx_wosparepart_gen", sequenceName = "trx_wosparepart_seq")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trx_wosparepart_gen")
+    @SequenceGenerator(name = "trx_wosparepart_gen", sequenceName = "trx_wosparepart_seq", allocationSize = 1)
     Integer id;
 
-    @NotNull(message="Work Order Service ID cannot be null")
+    @Column(name = "wosparepartid")
+    @NotNull
     String woSparepartID;
+    @Column(name = "partid")
     String partID;
+    @Column(name = "qty")
     Integer qty;
+    @Column(name = "c2")
     Boolean c2;
+    @Column(name = "discount")
     Double discount;
+    @Column(name = "total")
     Double total;
+    @Column(name = "woid")
     String woID;
+    @Column(name = "source")
     String source;
+    @Column(name = "kpb")
     Boolean KPB;
+    @Column(name = "harga")
     Double harga;
+    @Column(name = "ppnrate")
     Double ppnRate;
+    @Column(name = "ppnamount")
     Double ppnAmount;
+    @Column(name = "claimdiscount")
     Double claimDiscount;
-//    Double ppnrate;
-//    Double ppnamount;
 
     @Embedded
     private CreationalSpecification workOrderServiceCreational;

src/main/java/com/eksad/masterdata/repository/WorkOrderRepository.java

 package com.eksad.masterdata.repository;
 
 import com.eksad.masterdata.common.GenericRepository;
-import com.eksad.masterdata.domain.WorkOrder;
+import com.eksad.masterdata.domain.workorder.WorkOrder;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/com/eksad/masterdata/service/PullNJBNSCHystrixService.java

@@ -20,7 +20,7 @@ import com.eksad.masterdata.common.CustomRestTemplate;
 import com.eksad.masterdata.common.RequestUtil;
 import com.eksad.masterdata.domain.APIPullNjbNscDetail;
 import com.eksad.masterdata.domain.APIPullNjbNscHeader;
-import com.eksad.masterdata.domain.WorkOrder;
+import com.eksad.masterdata.domain.workorder.WorkOrder;
 import com.eksad.masterdata.repository.APIPullNjbNscRepository;
 import com.eksad.masterdata.repository.WorkOrderRepository;
 import com.fasterxml.jackson.core.JsonProcessingException;

src/main/resources/application-dev.properties

@@ -35,3 +35,5 @@ spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.S
 kafka.topic.name=pipeline-topic
 
 dam.cust.purch.h3               = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
+dam.masterdata.h1               = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/}
+dam.ppn.query.url               = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn}
\ No newline at end of file

src/main/resources/application-prod.properties

 server.port=8081
 
+dam.cust.purch.h3               = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
+dam.masterdata.h1               = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/}
+dam.ppn.query.url               = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn}
+
 spring.datasource.url = jdbc:postgresql://localhost:5432/postgres
 spring.datasource.username = postgres
 spring.datasource.password = password.1