Updated with offer lookup condition

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

@@ -5,15 +5,17 @@ import com.nisum.offertransactionservice.model.OfferLookup;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
 
 import javax.swing.text.html.Option;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
 public interface OfferLookupRepo extends JpaRepository<OfferLookup,String> {
 
-    @Query(value= "SELECT * FROM offer_lookup WHERE id=:hhid" , nativeQuery = true)
-    public List<OfferLookup> findByHhId(String hhid);
+    @Query(value= "SELECT * FROM offer_lookup WHERE id in :ids and offer_type = :offerType" , nativeQuery = true)
+    public List<OfferLookup> findByHhId(@Param("ids") Collection<String> ids, @Param("offerType") String offerType);
 
 
 

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

@@ -13,7 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Service;
 
+import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -36,7 +38,8 @@ public class OfferCallingPEService {
     public OfferTransactionResponse getDiscountedItemList(OfferTransactionRequest offerTransactionRequest) {
         log.info("Inside getDiscountedItemList Method");
         List<OfferLookup> eligibleOffer = new ArrayList();
-        offerLookupRepo.findByHhId(offerTransactionRequest.getHhId()).forEach(eligibleOffer::add);
+        final List<@NotNull String> idList = Arrays.asList(offerTransactionRequest.getHhId(), "ANY");
+        offerLookupRepo.findByHhId(idList,"Customer").forEach(eligibleOffer::add);
         List<OfferLookupDTO> offerLookupDTOList = getOfferMetaDto(eligibleOffer);
         if (offerLookupDTOList.isEmpty()) {
             log.error("Offer lookup Object is empty");

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

@@ -60,7 +60,7 @@ class OfferTransactionControllerTest {
     @Description("Component test for getOfferTransactionResponse method")
     @Test
     void getOfferTransactionResponse() throws InterruptedException {
-        when(offerLookupRepo.findByHhId(ArgumentMatchers.any())).thenReturn(getOffers());
+        when(offerLookupRepo.findByHhId(ArgumentMatchers.any(),ArgumentMatchers.any())).thenReturn(getOffers());
         when(clientService.getPeResponseFlux(Mockito.any(PERequest.class))).thenReturn(getPeResponse());
         when(offerCallingPEService.getOfferMetaDto(ArgumentMatchers.any())).thenReturn(getOfferLookupDto());
         Mockito.doReturn(Optional.of(getOfferMeta())).when(offerMetaDataRepo).findByOfferIdAndOfferStatusIgnoreCase(Mockito.anyLong(), Mockito.anyString());

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

@@ -49,7 +49,7 @@ public class OfferServiceTest {
     @Test
     public void serviceTest() {
         OfferTransactionRequest offerTransactionRequest = getOfferTransactionRequest();
-        Mockito.when(offerLookupRepo.findByHhId(ArgumentMatchers.any())).thenReturn(returnOffers());
+        Mockito.when(offerLookupRepo.findByHhId(ArgumentMatchers.any(),ArgumentMatchers.any())).thenReturn(returnOffers());
         Mockito.when(clientService.getPeResponseFlux(ArgumentMatchers.any())).thenReturn(getPeResponse());
         Mockito.doReturn(getOfferMeta()).when(offerMetaDataRepo).findByOfferIdAndOfferStatusIgnoreCase(ArgumentMatchers.any(),ArgumentMatchers.any());
         OfferTransactionResponse offerTransactionResponse = offerCallingPEService.getDiscountedItemList(offerTransactionRequest);
@@ -59,7 +59,7 @@ public class OfferServiceTest {
     @Test(expected = GlobalApiGenericException.class)
     public void serviceNegTest() {
         OfferTransactionRequest offerTransactionRequest = getOfferTransactionRequest();
-        Mockito.when(offerLookupRepo.findByHhId(ArgumentMatchers.any())).thenReturn(returnOffers());
+        Mockito.when(offerLookupRepo.findByHhId(ArgumentMatchers.any(),ArgumentMatchers.any())).thenReturn(returnOffers());
         Mockito.doReturn(Optional.empty()).when(offerMetaDataRepo).findByOfferIdAndOfferStatusIgnoreCase(ArgumentMatchers.any(),ArgumentMatchers.any());
         offerCallingPEService.getDiscountedItemList(offerTransactionRequest);
     }