Modified pojos and properties file wrt to sync with store consumer service

src/main/java/com/nisum/offertransactionservice/client/ClientService.java

@@ -56,9 +56,9 @@ public class ClientService {
 
 
     public Mono<String> getStringMono(String uuid) {
-        WebClient build = WebClient.builder().baseUrl(offerTransactionConfig.getScBaseUrl()).build();
+        WebClient build = WebClient.builder().baseUrl(offerTransactionConfig.getSpBaseUrl()).build();
         return build.post().
-                uri(offerTransactionConfig.getStoreConsumerUrl()).
+                uri(offerTransactionConfig.getStoreProducerUrl()).
                 accept(MediaType.APPLICATION_JSON).
                 body(Mono.just(uuid), String.class).
                 retrieve().

src/main/java/com/nisum/offertransactionservice/config/OfferTransactionConfig.java

@@ -9,31 +9,28 @@ import org.springframework.context.annotation.Configuration;
 public class OfferTransactionConfig {
 
 
-    private String storeConsumerUrl;
+    private String storeProducerUrl;
 
-    private String scBaseUrl;
+    private String spBaseUrl;
 
     private String promotionEngineUrl;
 
     private String peBaseUrl;
 
-
-
-
-    public String getScBaseUrl() {
-        return scBaseUrl;
+    public String getStoreProducerUrl() {
+        return storeProducerUrl;
     }
 
-    public String getStoreConsumerUrl() {
-        return storeConsumerUrl;
+    public void setStoreProducerUrl(String storeProducerUrl) {
+        this.storeProducerUrl = storeProducerUrl;
     }
 
-    public void setStoreConsumerUrl(String storeConsumerUrl) {
-        this.storeConsumerUrl = storeConsumerUrl;
+    public String getSpBaseUrl() {
+        return spBaseUrl;
     }
 
-    public void setScBaseUrl(String scBaseUrl) {
-        this.scBaseUrl = scBaseUrl;
+    public void setSpBaseUrl(String spBaseUrl) {
+        this.spBaseUrl = spBaseUrl;
     }
 
     public String getPromotionEngineUrl() {

src/main/java/com/nisum/offertransactionservice/dao/OfferLookupRepo.java

@@ -3,5 +3,5 @@ package com.nisum.offertransactionservice.dao;
 import com.nisum.offertransactionservice.model.OfferLookup;
 import org.springframework.data.repository.CrudRepository;
 
-public interface OfferLookupRepo extends CrudRepository<OfferLookup,String> {
+public interface OfferLookupRepo extends CrudRepository<OfferLookup,Long> {
 }

src/main/java/com/nisum/offertransactionservice/dao/OfferMetaDataRepo.java

@@ -6,8 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
 
-public interface OfferMetaDataRepo extends JpaRepository<OfferMeta,String> {
+public interface OfferMetaDataRepo extends JpaRepository<OfferMeta,Long> {
 
-    public Optional<OfferMeta> findByOfferIdAndOfferStatus(String offerId,String offerStatus);
+    public Optional<OfferMeta> findByOfferIdAndOfferStatus(Long offerId,String offerStatus);
 
 }

src/main/java/com/nisum/offertransactionservice/model/OfferLookup.java

@@ -13,13 +13,13 @@ import javax.persistence.*;
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = false)
 @Entity
-@Table(name = "offerlookup")
+@Table(name = "offer_lookup")
 @IdClass(OfferLookupComposite.class)
 public class OfferLookup {
 
     @Id
-    @Column(name = "offer_lookup_id")
-    String id;
+    @Column(name = "id")
+    Long id;
 
     @Id
     @Column(name ="offer_type")
@@ -27,7 +27,7 @@ public class OfferLookup {
 
     @Id
     @Column(name ="offer_id")
-    String offerId;
+    Long offerId;
 
     @Column(name ="store_id")
     String storeId;

src/main/java/com/nisum/offertransactionservice/model/OfferMeta.java

@@ -18,12 +18,12 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = false)
 @Entity
-@Table(name = "offer_meta_data")
+@Table(name = "offer_metadata")
 public class OfferMeta {
 
     @Id
-    @Column(name="offerid")
-    String offerId;
+    @Column(name="offer_id")
+    Long offerId;
 
     @Column(name="start_time")
     LocalDateTime startTime;

src/main/java/com/nisum/offertransactionservice/service/OfferCallingPEService.java

@@ -76,9 +76,6 @@ public class OfferCallingPEService {
                 .filter(offerLookupDTO -> offerLookupDTO!=null)
                 .collect(Collectors.toList());
 
-
-
-
     }
 
 

src/main/resources/application.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=welcome123
 endpoint.url.promotionEngineUrl=/promotionEngine/calculateDiscount
-endpoint.url.peBaseUrl=http://localhost:8089
-endpoint.url.storeConsumerUrl=/store/producer
-endpoint.url.scBaseUrl=http://localhost:8081
+endpoint.url.peBaseUrl=http://localhost:8086
+endpoint.url.storeProducerUrl=/store/producer
+endpoint.url.spBaseUrl=http://localhost:7070
 server.port = 8085

src/test/java/com/nisum/offertransactionservice/client/ClientServiceTest.java

@@ -54,12 +54,9 @@ public class ClientServiceTest {
     @Mock
     private WebClient.ResponseSpec responseMock;
 
-
-
     @InjectMocks
     ClientService clientService;
 
-
     @Mock
     OfferTransactionConfig offerTransactionConfig;;
 
@@ -68,7 +65,7 @@ public class ClientServiceTest {
     public void getStringMonoTest(){
         String uuid = "86fd4146-0540-405b-b621-a95f4ccdfa0d";
         when(offerTransactionConfig.getPeBaseUrl()).thenReturn("http://localhost:8089");
-        when(offerTransactionConfig.getScBaseUrl()).thenReturn("http://localhost:8081");
+        when(offerTransactionConfig.getSpBaseUrl()).thenReturn("http://localhost:8081");
         when(webClientMock.post()).thenReturn(requestBodyUriMock);
         when(requestBodyUriMock.uri("/store/producer")).thenReturn(requestBodyMock);
         when(requestBodyMock.bodyValue(Mono.just(uuid))).thenReturn(requestHeadersMock);
@@ -91,8 +88,6 @@ public class ClientServiceTest {
         return peRequest;
     }
 
-
-
     private PEResponse getPeResponse() {
         PEResponse peResponse = new PEResponse();
         peResponse.setHhid("123");
@@ -105,11 +100,4 @@ public class ClientServiceTest {
         return peResponse;
     }
 
-
-
-
-
-
-
-
 }

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

@@ -64,8 +64,8 @@ public class OfferControllerTest {
     }
 
     public List<OfferLookup> returnOffers() {
-        OfferLookup offerLookup1 = new OfferLookup("1", "12", "234", "02", "AND", "BOGO");
-        OfferLookup offerLookup2 = new OfferLookup("2", "13", "234", "02", "OR", "BXGY");
+        OfferLookup offerLookup1 = new OfferLookup(1L, "12", 23L, "02", "AND", "BOGO");
+        OfferLookup offerLookup2 = new OfferLookup(2L, "13", 24L, "02", "OR", "BXGY");
         List<OfferLookup> offerLookups = new ArrayList<>();
         offerLookups.add(offerLookup1);
         offerLookups.add(offerLookup2);

src/test/java/com/nisum/offertransactionservice/service/EndOfSaleTest.java

@@ -66,8 +66,8 @@ public class EndOfSaleTest {
     }
 
     public List<OfferLookup> returnOffers() {
-        OfferLookup offerLookup1 = new OfferLookup("1", "12", "234", "02", "AND", "BOGO");
-        OfferLookup offerLookup2 = new OfferLookup("2", "13", "234", "02", "OR", "BXGY");
+        OfferLookup offerLookup1 = new OfferLookup(1L, "12", 23L, "02", "AND", "BOGO");
+        OfferLookup offerLookup2 = new OfferLookup(2L, "13", 24L, "02", "OR", "BXGY");
         List<OfferLookup> offerLookups = new ArrayList<>();
         offerLookups.add(offerLookup1);
         offerLookups.add(offerLookup2);

src/test/java/com/nisum/offertransactionservice/service/OfferServiceTest.java

@@ -106,8 +106,8 @@ public class OfferServiceTest {
     }
 
     public Iterable<OfferLookup> returnOffers() {
-        OfferLookup offerLookup1 = new OfferLookup("1", "12", "234", "02", "AND", "BOGO");
-        OfferLookup offerLookup2 = new OfferLookup("2", "13", "234", "02", "OR", "BXGY");
+        OfferLookup offerLookup1 = new OfferLookup(1L, "12", 20L, "02", "AND", "BOGO");
+        OfferLookup offerLookup2 = new OfferLookup(2L, "13", 23L, "02", "OR", "BXGY");
         List<OfferLookup> offerLookups = new ArrayList<>();
         offerLookups.add(offerLookup1);
         offerLookups.add(offerLookup2);
@@ -123,7 +123,7 @@ public class OfferServiceTest {
         offerMeta.setExpiryTime(LocalDateTime.of(2021,01,01,01,01));
         offerMeta.setStartTime(LocalDateTime.of(2020,01,01,01,01));
         offerMeta.setOfferDesc("30 percent");
-        offerMeta.setOfferId("o1");
+        offerMeta.setOfferId(1l);
         offerMeta.setOfferStatus("Active");
         offerMeta.setRcptTxt("text");
         offerMeta.setOfferType("aaa");
@@ -131,7 +131,6 @@ public class OfferServiceTest {
         return Optional.of(offerMeta);
     }
 
-
     private List<OfferLookupDTO> getOfferLookupDto(){
         OfferLookupDTO offerLookupDTO = new OfferLookupDTO();
         offerLookupDTO.setId("123456");

src/test/resources/application.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=welcome123
 endpoint.url.promotionEngineUrl=/promotionEngine/calculateDiscount
-endpoint.url.peBaseUrl=http://localhost:8081
-endpoint.url.storeConsumerUrl=/store/producer
-endpoint.url.scBaseUrl=http://localhost:8081
+endpoint.url.peBaseUrl=http://localhost:8086
+endpoint.url.storeProducerUrl=/store/producer
+endpoint.url.spBaseUrl=http://localhost:7070
 server.port = 8085