Update Controller and test case for UI dependency

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

 package com.nisum.offertransactionservice.controller;
 
-import com.nisum.offertransactionservice.model.EndOfSaleReq;
-import com.nisum.offertransactionservice.model.OfferTransactionRequest;
-import com.nisum.offertransactionservice.model.OfferTransactionResponse;
+import com.nisum.offertransactionservice.model.*;
 import com.nisum.offertransactionservice.service.EndOfSaleService;
 import com.nisum.offertransactionservice.service.EndOfTransactionService;
 import com.nisum.offertransactionservice.service.OfferCallingPEService;
@@ -10,15 +8,15 @@ import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.List;
 import java.util.UUID;
 
 @RestController
+@CrossOrigin
 public class OfferTransactionController {
 
     @Autowired
@@ -31,7 +29,8 @@ public class OfferTransactionController {
     private EndOfTransactionService endOfTransactionService;
 
     @PostMapping("offerTransactionCall")
-    public OfferTransactionResponse getOfferTransactionResponse(@Valid @RequestBody OfferTransactionRequest offerTransactionRequest) {
+    public OfferTransactionResponse getOfferTransactionResponse(@Valid @RequestBody OfferTransactionRequest offerTransactionRequest) throws InterruptedException {
+        Thread.sleep(1000);
         MDC.put("swy-res-unique-uuid", offerTransactionRequest.getHhId());
         MDC.put("user-id", offerTransactionRequest.getHhId());
         return offerCallingPEService.getDiscountedItemList(offerTransactionRequest);
@@ -39,20 +38,24 @@ public class OfferTransactionController {
 
 
     @PostMapping("endOfSale")
-    public ResponseEntity<String> endOfSale(@Valid @RequestBody EndOfSaleReq endOfSaleReq) throws IOException {
+    public EndOfSaleResponse 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);
-        return new ResponseEntity<String>(uuid.toString(), HttpStatus.OK);
+        EndOfSaleResponse endOfSaleResponse = new EndOfSaleResponse();
+        endOfSaleResponse.setUuId(uuid.toString());
+        return endOfSaleResponse;
     }
 
 
+
+
     @PostMapping("/endOfTransaction")
-    public ResponseEntity<String> endOfTransaction(@Valid @RequestBody String uuid) {
+    public String endOfTransaction(@Valid @RequestBody String uuid) {
         MDC.put("swy-res-unique-uuid", uuid);
         MDC.put("user-id", uuid);
-        String response = endOfTransactionService.endOfTransaction(uuid);
-        return new ResponseEntity(response, HttpStatus.OK);
+        return endOfTransactionService.endOfTransaction(uuid);
+
     }
 
 }

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

+package com.nisum.offertransactionservice.model;
+
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = false)
+public class EndOfSaleResponse {
+
+
+        String uuId;
+
+
+}

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

 package com.nisum.offertransactionservice.service;
 
 import com.nisum.offertransactionservice.dao.EndOfSaleRepo;
-import com.nisum.offertransactionservice.model.EndOfSaleReq;
-import com.nisum.offertransactionservice.model.EndOfSaleEntity;
+import com.nisum.offertransactionservice.model.*;
 import lombok.extern.slf4j.Slf4j;
 import org.codehaus.jackson.map.ObjectMapper;
 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;
 
 @Service
@@ -32,4 +34,6 @@ public class EndOfSaleService {
         return endOfSaleEntity.getUuid();
     }
 
+
+
 }

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

 package com.nisum.offertransactionservice.client;
 
 
+import com.nisum.offertransactionservice.config.OfferTransactionConfig;
 import com.nisum.offertransactionservice.model.Item;
 import com.nisum.offertransactionservice.model.PERequest;
 import com.nisum.offertransactionservice.model.PEResponse;
@@ -63,10 +64,16 @@ public class ClientServiceTest {
     ClientService clientService;
 
 
+    @Mock
+    OfferTransactionConfig offerTransactionConfig;;
+
+
     @Test
     public void getStringMonoTest(){
         String uuid = "86fd4146-0540-405b-b621-a95f4ccdfa0d";
-        ReflectionTestUtils.setField(clientService,"storeConsumerUrl","/store/producer");
+//        ReflectionTestUtils.setField(clientService,"storeConsumerUrl","/store/producer");
+        when(offerTransactionConfig.getPeBaseUrl()).thenReturn("http://localhost:8081");
+        when(offerTransactionConfig.getScBaseUrl()).thenReturn("http://localhost:8081");
         when(webClientMock.post()).thenReturn(requestBodyUriMock);
         when(requestBodyUriMock.uri("/store/producer")).thenReturn(requestBodyMock);
         when(requestBodyMock.bodyValue(Mono.just(uuid))).thenReturn(requestHeadersMock);