Commit 2047d62f authored by Kali Padhi's avatar Kali Padhi

Modified accrodingly for UI client

parent 8d166b6f
...@@ -112,7 +112,7 @@ INSERT INTO transaction_recorder VALUES ( uuid_generate_v4() , ...@@ -112,7 +112,7 @@ INSERT INTO transaction_recorder VALUES ( uuid_generate_v4() ,
CREATE TABLE offer_metadata CREATE TABLE offer_metadata
( (
offer_id serial PRIMARY KEY, offer_id serial PRIMARY KEY,
eligibilty VARCHAR(200), eligibility VARCHAR(200),
discount_type VARCHAR(200), discount_type VARCHAR(200),
status VARCHAR(50) NOT NULL, status VARCHAR(50) NOT NULL,
start_time VARCHAR(20), start_time VARCHAR(20),
......
package com.nisum.offertransactionservice.controller; package com.nisum.offertransactionservice.controller;
import com.nisum.offertransactionservice.dto.EndOfSaleReq; import com.nisum.offertransactionservice.dto.EndOfSaleReq;
import com.nisum.offertransactionservice.dto.EndOfSaleResponse;
import com.nisum.offertransactionservice.dto.OfferTransactionRequest; import com.nisum.offertransactionservice.dto.OfferTransactionRequest;
import com.nisum.offertransactionservice.dto.OfferTransactionResponse; import com.nisum.offertransactionservice.dto.OfferTransactionResponse;
import com.nisum.offertransactionservice.service.EndOfSaleService; import com.nisum.offertransactionservice.service.EndOfSaleService;
...@@ -14,7 +15,7 @@ import javax.validation.Valid; ...@@ -14,7 +15,7 @@ import javax.validation.Valid;
import java.io.IOException; import java.io.IOException;
@RestController @RestController
@CrossOrigin @CrossOrigin("*")
public class OfferTransactionController { public class OfferTransactionController {
@Autowired @Autowired
...@@ -35,16 +36,16 @@ public class OfferTransactionController { ...@@ -35,16 +36,16 @@ public class OfferTransactionController {
@PostMapping("endOfSale") @PostMapping("endOfSale")
public 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("swy-res-unique-uuid", endOfSaleReq.getOfferTransactionResponse().getHhid());
MDC.put("user-id", endOfSaleReq.getOfferTransactionResponse().getHhid()); MDC.put("user-id", endOfSaleReq.getOfferTransactionResponse().getHhid());
String transactionID = endOfSaleService.putEndofSaleResInDb(endOfSaleReq); String transactionID = endOfSaleService.putEndofSaleResInDb(endOfSaleReq);
return transactionID; EndOfSaleResponse endOfSaleResponse = new EndOfSaleResponse();
endOfSaleResponse.setUuId(transactionID);
return endOfSaleResponse;
} }
@PostMapping("/endOfTransaction") @PostMapping("/endOfTransaction")
public String endOfTransaction(@Valid @RequestBody String uuid) { public String endOfTransaction(@Valid @RequestBody String uuid) {
MDC.put("swy-res-unique-uuid", uuid); MDC.put("swy-res-unique-uuid", uuid);
......
...@@ -35,6 +35,6 @@ public class EndOfSaleEntity { ...@@ -35,6 +35,6 @@ public class EndOfSaleEntity {
@Type(type = "jsonb") @Type(type = "jsonb")
@Column(name = "offers") @Column(name = "offers")
String offers; String offers;
@Column(name = "isprocessed") @Column(name = "finished")
Boolean isProcessed = Boolean.TRUE; Boolean isProcessed = Boolean.TRUE;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment