Merge with latest cahnges and changed PK to string

readme.md

@@ -61,16 +61,16 @@ Once you create use the below query to insert a data
 
 INSERT INTO public.offer_lookup(
 	 store_id, terminal, offer_type, offer_id, pre_condition, id)
-	VALUES ('0001','001','Customer',1,'AND',"54321");
+	VALUES ('0001','001','Customer',1,'AND','54321');
 INSERT INTO public.offer_lookup(
 	store_id, terminal, offer_type, offer_id, pre_condition,id)
-	VALUES ('0001','001','Customer',2,'AND',"54321");
+	VALUES ('0001','001','Customer',2,'AND','54321');
 INSERT INTO public.offer_lookup(
 	store_id, terminal, offer_type, offer_id, pre_condition,id)
-	VALUES ('0001','001','Customer',3,'AND',"54321");
+	VALUES ('0001','001','Customer',3,'AND','54321');
 INSERT INTO public.offer_lookup(
 	store_id, terminal, offer_type, offer_id, pre_condition,id)
-	VALUES ('0001','001','Customer',4,'AND',"54321");
+	VALUES ('0001','001','Customer',4,'AND','54321');
 
 ```
 

src/test/java/com/nisum/offertransactionservice/controller/OfferControllerTest.java

@@ -71,8 +71,8 @@ public class OfferControllerTest {
     }
 
     public List<OfferLookup> returnOffers() {
-        OfferLookup offerLookup1 = new OfferLookup(1L, "12", 23L, "02", "AND", "BOGO");
-        OfferLookup offerLookup2 = new OfferLookup(2L, "13", 24L, "02", "OR", "BXGY");
+        OfferLookup offerLookup1 = new OfferLookup("1", "12", 23L, "02", "AND", "BOGO");
+        OfferLookup offerLookup2 = new OfferLookup("2", "13", 24L, "02", "OR", "BXGY");
         List<OfferLookup> offerLookups = new ArrayList<>();
         offerLookups.add(offerLookup1);
         offerLookups.add(offerLookup2);
@@ -93,7 +93,7 @@ public class OfferControllerTest {
 
     private OfferTransactionRequest getOfferTransactionRequest() {
         OfferTransactionRequest offerTransactionRequest = new OfferTransactionRequest();
-        offerTransactionRequest.setHhId(123L);
+        offerTransactionRequest.setHhId("123");
         List<Item> itemList = new ArrayList<>();
         Item item1 = new Item("Coke", "12", 13.05);
         Item item2 = new Item("Thumpsup", "11", 14.05);

src/test/java/com/nisum/offertransactionservice/controller/OfferTransactionControllerIntegrationTest.java

@@ -135,8 +135,8 @@ public class OfferTransactionControllerIntegrationTest extends AbstractTestBase{
 
 
     public List<OfferLookup> returnOffers() {
-        OfferLookup offerLookup1 = new OfferLookup(1L, "12", 23L, "02", "AND", "BOGO");
-        OfferLookup offerLookup2 = new OfferLookup(2L, "13", 24L, "02", "OR", "BXGY");
+        OfferLookup offerLookup1 = new OfferLookup("1", "12", 23L, "02", "AND", "BOGO");
+        OfferLookup offerLookup2 = new OfferLookup("2", "13", 24L, "02", "OR", "BXGY");
         List<OfferLookup> offerLookups = new ArrayList<>();
         offerLookups.add(offerLookup1);
         offerLookups.add(offerLookup2);
@@ -145,7 +145,7 @@ public class OfferTransactionControllerIntegrationTest extends AbstractTestBase{
 
     private OfferTransactionRequest getOfferTransactionRequest() {
         OfferTransactionRequest offerTransactionRequest = new OfferTransactionRequest();
-        offerTransactionRequest.setHhId(54321L);
+        offerTransactionRequest.setHhId("54321");
         offerTransactionRequest.setItemList(getItemList());
         return offerTransactionRequest;
     }

src/test/java/com/nisum/offertransactionservice/controller/OfferTransactionControllerTest.java

@@ -93,7 +93,7 @@ class OfferTransactionControllerTest {
 
     private OfferTransactionRequest getOfferTransactionRequest() {
         OfferTransactionRequest offerTransactionRequest = new OfferTransactionRequest();
-        offerTransactionRequest.setHhId(54321L);
+        offerTransactionRequest.setHhId("54321");
         offerTransactionRequest.setItemList(getItemList());
         return offerTransactionRequest;
     }

src/test/resources/application-integration.properties

-spring.datasource.url=jdbc:postgresql://127.0.0.1:5432/postgres
-spring.datasource.username=user
-spring.datasource.password=password123
+spring.datasource.url=jdbc:postgresql://127.0.0.1:5432/storedb
+spring.datasource.username=postgres
+spring.datasource.password=dbpwd
 endpoint.url.promotionEngineUrl=/promotionEngine/calculateDiscount
 endpoint.url.peBaseUrl=http://localhost:7073
 endpoint.url.storeProducerUrl=/store/producer