changes - review comments

build.gradle

@@ -6,7 +6,6 @@ plugins {
 	
 }
 apply plugin: 'net.ltgt.apt-idea'
-apply plugin: 'net.ltgt.apt-eclipse'
 
 group = 'com.nisum'
 version = '0.0.1-SNAPSHOT'

src/main/java/com/nisum/offertransactionservice/controller/OfferTransactionController.java

@@ -38,13 +38,11 @@ public class OfferTransactionController {
 
 
     @PostMapping("endOfSale")
-    public EndOfSaleResponse endOfSale(@Valid @RequestBody EndOfSaleReq endOfSaleReq) throws IOException {
+    public String endOfSale(@Valid @RequestBody EndOfSaleReq endOfSaleReq) throws IOException {
         MDC.put("swy-res-unique-uuid", endOfSaleReq.getOfferTransactionResponse().getHhid());
         MDC.put("user-id", endOfSaleReq.getOfferTransactionResponse().getHhid());
-        UUID uuid = endOfSaleService.putEndofSaleResInDb(endOfSaleReq);
-        EndOfSaleResponse endOfSaleResponse = new EndOfSaleResponse();
-        endOfSaleResponse.setUuId(uuid.toString());
-        return endOfSaleResponse;
+        String transactionID = endOfSaleService.putEndofSaleResInDb(endOfSaleReq);
+        return transactionID;
     }
 
 

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

@@ -23,6 +23,4 @@ public class Item {
     @NotNull
     Double price;
 
-    @NotNull
-    String cmsCoupouns;
 }

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

@@ -9,6 +9,7 @@ import lombok.experimental.FieldDefaults;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.List;
+import java.util.UUID;
 
 import static com.google.common.collect.Lists.newArrayList;
 
@@ -21,6 +22,8 @@ public class OfferTransactionRequest {
     @NotNull
     String hhId;
 
+    String transactionId= UUID.randomUUID().toString();
+
     @Valid
     List<Item> itemList = newArrayList();
 }

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

@@ -17,5 +17,6 @@ import static com.google.common.collect.Lists.newArrayList;
 public class OfferTransactionResponse {
 
     String hhid;
+    String transactionId;
     List<Item> discountedItemList = newArrayList();
 }

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

@@ -8,10 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 @Service
 @Slf4j
@@ -22,16 +19,17 @@ public class EndOfSaleService {
 
 
 
-    public UUID putEndofSaleResInDb(EndOfSaleReq endOfSaleReq) throws IOException {
+    public String putEndofSaleResInDb(EndOfSaleReq endOfSaleReq) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         String offerTransactionResponseJson = mapper.writeValueAsString(endOfSaleReq.getOfferTransactionResponse());
         String offersJosn = mapper.writeValueAsString(endOfSaleReq.getOffers());
         EndOfSaleEntity endOfSaleEntity = new EndOfSaleEntity();
         endOfSaleEntity.setOfferTransactionResponse(offerTransactionResponseJson);
         endOfSaleEntity.setOffers(offersJosn);
-        endOfSaleEntity.setUuid(UUID.randomUUID());
         endOfSaleRepo.save(endOfSaleEntity);
-        return endOfSaleEntity.getUuid();
+        if(Objects.nonNull(endOfSaleReq.getOfferTransactionResponse().getTransactionId()))
+            return endOfSaleReq.getOfferTransactionResponse().getTransactionId();
+        return "";
     }
 
 

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

@@ -6,18 +6,13 @@ import com.nisum.offertransactionservice.converter.OfferConvertion;
 import com.nisum.offertransactionservice.dao.OfferLookupRepo;
 import com.nisum.offertransactionservice.genericexception.GlobalApiGenericException;
 import com.nisum.offertransactionservice.model.*;
-import com.safeway.epe.model.Response;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.PropertySource;
-import org.springframework.http.*;
 import org.springframework.stereotype.Service;
-import org.springframework.web.reactive.function.client.*;
-import reactor.core.publisher.Flux;
+import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
 import reactor.core.publisher.Mono;
 
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,26 +25,8 @@ public class OfferCallingPEService {
     @Autowired
     private OfferLookupRepo offerLookupRepo;
 
-   /* @Autowired
-    private PEResponseToOfferTransactionResConverter peResponseToOfferTransactionResConverter;*/
-
     @Autowired
-    ClientService clientService;
-
-
-//    private WebClient webClient;
-//
-//
-//
-//    @PostConstruct
-//    public void init() {
-//        webClient = WebClient.builder().baseUrl(baseUrl).
-//                defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).
-//                filter(logRequest()).
-//                filter(logResponse()).
-//                build();
-//    }
-//
+    private ClientService clientService;
 
     private ExchangeFilterFunction logRequest() {
         return ExchangeFilterFunction.ofRequestProcessor(clientRequest -> {
@@ -81,6 +58,7 @@ public class OfferCallingPEService {
         PEResponse peResponseFlux = clientService.getPeResponseFlux(peRequest);
         log.debug("Promotional Engine WebClient call End");
         offerTransactionResponse = OfferConvertion.INSTANCE.map(peResponseFlux);
+        offerTransactionResponse.setTransactionId(offerTransactionRequest.getTransactionId());
         log.debug("Offer Transaction Response {}", offerTransactionResponse);
         return offerTransactionResponse;
     }

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

@@ -88,8 +88,8 @@ public class ClientServiceTest {
         PERequest peRequest = new PERequest();
         peRequest.setHhId("123");
         List<Item> itemList = new ArrayList<>();
-        Item item1 = new Item("Coke", "12", 13.05, "cmsCoupons");
-        Item item2 = new Item("Thumpsup", "11", 14.05, "cmsCoupons");
+        Item item1 = new Item("Coke", "12", 13.05);
+        Item item2 = new Item("Thumpsup", "11", 14.05);
         itemList.add(item1);
         itemList.add(item2);
         peRequest.setItemList(itemList);
@@ -102,8 +102,8 @@ public class ClientServiceTest {
         PEResponse peResponse = new PEResponse();
         peResponse.setHhid("123");
         List<Item> itemList = new ArrayList<>();
-        Item item1 = new Item("Coke", "12", 6.05, "cmsCoupons");
-        Item item2 = new Item("Thumpsup", "11", 12.32, "cmsCoupons");
+        Item item1 = new Item("Coke", "12", 6.05);
+        Item item2 = new Item("Thumpsup", "11", 12.32);
         itemList.add(item1);
         itemList.add(item2);
         peResponse.setDiscountedItemList(itemList);

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

@@ -41,8 +41,8 @@ public class OfferControllerTest {
 
     @Test
     public void endOfSaleTest() throws IOException {
-        Mockito.when(endOfSaleService.putEndofSaleResInDb(getEndOfSaleReq())).thenReturn(UUID.randomUUID());
-        UUID uuid = endOfSaleService.putEndofSaleResInDb(getEndOfSaleReq());
+        Mockito.when(endOfSaleService.putEndofSaleResInDb(getEndOfSaleReq())).thenReturn(UUID.randomUUID().toString());
+        String uuid = endOfSaleService.putEndofSaleResInDb(getEndOfSaleReq());
         Assert.assertNotNull(uuid);
     }
 
@@ -73,8 +73,8 @@ public class OfferControllerTest {
         OfferTransactionResponse offerTransactionResponse = new OfferTransactionResponse();
         offerTransactionResponse.setHhid("123");
         List<Item> itemList = new ArrayList<>();
-        Item item1 = new Item("Coke", "12", 6.05, "cmsCoupons");
-        Item item2 = new Item("Thumpsup", "11", 12.32, "cmsCoupons");
+        Item item1 = new Item("Coke", "12", 6.05);
+        Item item2 = new Item("Thumpsup", "11", 12.32);
         itemList.add(item1);
         itemList.add(item2);
         offerTransactionResponse.setDiscountedItemList(itemList);
@@ -85,8 +85,8 @@ public class OfferControllerTest {
         OfferTransactionRequest offerTransactionRequest = new OfferTransactionRequest();
         offerTransactionRequest.setHhId("123");
         List<Item> itemList = new ArrayList<>();
-        Item item1 = new Item("Coke", "12", 13.05, "cmsCoupons");
-        Item item2 = new Item("Thumpsup", "11", 14.05, "cmsCoupons");
+        Item item1 = new Item("Coke", "12", 13.05);
+        Item item2 = new Item("Thumpsup", "11", 14.05);
         itemList.add(item1);
         itemList.add(item2);
         offerTransactionRequest.setItemList(itemList);

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

@@ -41,7 +41,7 @@ public class EndOfSaleTest {
     public void putEndofSaleResInDbTest() throws IOException {
         EndOfSaleReq endOfSaleReq = getEndOfSaleReq();
         Mockito.when(endOfSaleRepo.save(ArgumentMatchers.any())).thenReturn(ArgumentMatchers.any());
-        UUID uuid = endOfSaleService.putEndofSaleResInDb(endOfSaleReq);
+        String uuid = endOfSaleService.putEndofSaleResInDb(endOfSaleReq);
         Assert.assertNotNull(uuid);
     }
 
@@ -56,8 +56,8 @@ public class EndOfSaleTest {
         OfferTransactionResponse offerTransactionResponse = new OfferTransactionResponse();
         offerTransactionResponse.setHhid("123");
         List<Item> itemList = new ArrayList<>();
-        Item item1 = new Item("Coke", "12", 6.05, "cmsCoupons");
-        Item item2 = new Item("Thumpsup", "11", 12.32, "cmsCoupons");
+        Item item1 = new Item("Coke", "12", 6.05);
+        Item item2 = new Item("Thumpsup", "11", 12.32);
         itemList.add(item1);
         itemList.add(item2);
         offerTransactionResponse.setDiscountedItemList(itemList);

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

@@ -54,8 +54,8 @@ public class OfferServiceTest {
         OfferTransactionResponse offerTransactionResponse = new OfferTransactionResponse();
         offerTransactionResponse.setHhid("123");
         List<Item> itemList = new ArrayList<>();
-        Item item1 = new Item("Coke", "12", 6.05, "cmsCoupons");
-        Item item2 = new Item("Thumpsup", "11", 12.32, "cmsCoupons");
+        Item item1 = new Item("Coke", "12", 6.05);
+        Item item2 = new Item("Thumpsup", "11", 12.32);
         itemList.add(item1);
         itemList.add(item2);
         offerTransactionResponse.setDiscountedItemList(itemList);
@@ -66,8 +66,8 @@ public class OfferServiceTest {
         PEResponse peResponse = new PEResponse();
         peResponse.setHhid("123");
         List<Item> itemList = new ArrayList<>();
-        Item item1 = new Item("Coke", "12", 6.05, "cmsCoupons");
-        Item item2 = new Item("Thumpsup", "11", 12.32, "cmsCoupons");
+        Item item1 = new Item("Coke", "12", 6.05);
+        Item item2 = new Item("Thumpsup", "11", 12.32);
         itemList.add(item1);
         itemList.add(item2);
         peResponse.setDiscountedItemList(itemList);
@@ -78,8 +78,8 @@ public class OfferServiceTest {
         PERequest peRequest = new PERequest();
         peRequest.setHhId("123");
         List<Item> itemList = new ArrayList<>();
-        Item item1 = new Item("Coke", "12", 13.05, "cmsCoupons");
-        Item item2 = new Item("Thumpsup", "11", 14.05, "cmsCoupons");
+        Item item1 = new Item("Coke", "12", 6.05);
+        Item item2 = new Item("Thumpsup", "11", 12.32);
         itemList.add(item1);
         itemList.add(item2);
         peRequest.setItemList(itemList);
@@ -90,8 +90,8 @@ public class OfferServiceTest {
         OfferTransactionRequest offerTransactionRequest = new OfferTransactionRequest();
         offerTransactionRequest.setHhId("123");
         List<Item> itemList = new ArrayList<>();
-        Item item1 = new Item("Coke", "12", 13.05, "cmsCoupons");
-        Item item2 = new Item("Thumpsup", "11", 14.05, "cmsCoupons");
+        Item item1 = new Item("Coke", "12", 6.05);
+        Item item2 = new Item("Thumpsup", "11", 12.32);
         itemList.add(item1);
         itemList.add(item2);
         offerTransactionRequest.setItemList(itemList);