Merge branch 'master' into 'master'

Master

See merge request !3

omd-checkout-service/pom.xml

@@ -16,6 +16,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
+		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 	</properties>
 
 	<dependencies>
@@ -23,7 +24,26 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
+	<dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+    </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+    <groupId>com.github.javafaker</groupId>
+    <artifactId>javafaker</artifactId>
+    <version>1.0.2</version>
+</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

omd-checkout-service/src/main/java/com/nisum/omd/OmdCheckoutServiceApplication.java

@@ -5,6 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class OmdCheckoutServiceApplication {
+	
 
 	public static void main(String[] args) {
 		SpringApplication.run(OmdCheckoutServiceApplication.class, args);

omd-checkout-service/src/main/java/com/nisum/omd/domain/BillingTo.java

+package com.nisum.omd.domain;
+
+public class BillingTo {
+
+	private String firstName;
+	private String lastName;
+	private String addressLine1;
+	private String city;
+	private String state;
+	private String zipCode;
+	private String country;
+	private int mobileNum;
+	private String eMailID;
+	private boolean residentialAddr;
+	
+	public BillingTo(String firstName, String lastName, String addressLine1, String city, String state, String zipCode,
+			String country, int mobileNum, String eMailID, boolean residentialAddr) {
+		super();
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.addressLine1 = addressLine1;
+		this.city = city;
+		this.state = state;
+		this.zipCode = zipCode;
+		this.country = country;
+		this.mobileNum = mobileNum;
+		this.eMailID = eMailID;
+		this.residentialAddr = residentialAddr;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public String getAddressLine1() {
+		return addressLine1;
+	}
+
+	public void setAddressLine1(String addressLine1) {
+		this.addressLine1 = addressLine1;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	public String getZipCode() {
+		return zipCode;
+	}
+
+	public void setZipCode(String zipCode) {
+		this.zipCode = zipCode;
+	}
+
+	public String getCountry() {
+		return country;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public int getMobileNum() {
+		return mobileNum;
+	}
+
+	public void setMobileNum(int mobileNum) {
+		this.mobileNum = mobileNum;
+	}
+
+	public String geteMailID() {
+		return eMailID;
+	}
+
+	public void seteMailID(String eMailID) {
+		this.eMailID = eMailID;
+	}
+
+	public boolean isResidentialAddr() {
+		return residentialAddr;
+	}
+
+	public void setResidentialAddr(boolean residentialAddr) {
+		this.residentialAddr = residentialAddr;
+	}
+	
+	
+	
+}

omd-checkout-service/src/main/java/com/nisum/omd/domain/LineItem.java

+package com.nisum.omd.domain;
+
+
+import java.util.Map;
+
+public class LineItem {
+	private String lineItemNumber;
+	private String skuNumber;
+	private String itemColorDesc;
+	private String size;
+	private String orderedQty;
+	private String productName;
+	private String itemType;
+	private boolean shipChrgApplInd;
+	private String estimatedShipDate;
+	private Map<String,Object> linePriceInfo;
+	private String taxCode;
+	private boolean autoAddInd;
+	private Map<String,Object> lineTax;
+	private String originalLineItemId;
+	private String vendorUpcCode;
+	private String brandCode;
+	private String eligibleReturnLocationCode;
+	public String getLineItemNumber() {
+		return lineItemNumber;
+	}
+	public void setLineItemNumber(String lineItemNumber) {
+		this.lineItemNumber = lineItemNumber;
+	}
+	public String getSkuNumber() {
+		return skuNumber;
+	}
+	public void setSkuNumber(String skuNumber) {
+		this.skuNumber = skuNumber;
+	}
+	public String getItemColorDesc() {
+		return itemColorDesc;
+	}
+	public void setItemColorDesc(String itemColorDesc) {
+		this.itemColorDesc = itemColorDesc;
+	}
+	public String getSize() {
+		return size;
+	}
+	public void setSize(String size) {
+		this.size = size;
+	}
+	public String getOrderedQty() {
+		return orderedQty;
+	}
+	public void setOrderedQty(String orderedQty) {
+		this.orderedQty = orderedQty;
+	}
+	public String getProductName() {
+		return productName;
+	}
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+	public String getItemType() {
+		return itemType;
+	}
+	public void setItemType(String itemType) {
+		this.itemType = itemType;
+	}
+	public boolean isShipChrgApplInd() {
+		return shipChrgApplInd;
+	}
+	public void setShipChrgApplInd(boolean shipChrgApplInd) {
+		this.shipChrgApplInd = shipChrgApplInd;
+	}
+	public String getEstimatedShipDate() {
+		return estimatedShipDate;
+	}
+	public void setEstimatedShipDate(String estimatedShipDate) {
+		this.estimatedShipDate = estimatedShipDate;
+	}
+	public Map<String, Object> getLinePriceInfo() {
+		return linePriceInfo;
+	}
+	public void setLinePriceInfo(Map<String, Object> linePriceInfo) {
+		this.linePriceInfo = linePriceInfo;
+	}
+	public String getTaxCode() {
+		return taxCode;
+	}
+	public void setTaxCode(String taxCode) {
+		this.taxCode = taxCode;
+	}
+	public boolean isAutoAddInd() {
+		return autoAddInd;
+	}
+	public void setAutoAddInd(boolean autoAddInd) {
+		this.autoAddInd = autoAddInd;
+	}
+	public Map<String, Object> getLineTax() {
+		return lineTax;
+	}
+	public void setLineTax(Map<String, Object> lineTax) {
+		this.lineTax = lineTax;
+	}
+	public String getOriginalLineItemId() {
+		return originalLineItemId;
+	}
+	public void setOriginalLineItemId(String originalLineItemId) {
+		this.originalLineItemId = originalLineItemId;
+	}
+	public String getVendorUpcCode() {
+		return vendorUpcCode;
+	}
+	public void setVendorUpcCode(String vendorUpcCode) {
+		this.vendorUpcCode = vendorUpcCode;
+	}
+	public String getBrandCode() {
+		return brandCode;
+	}
+	public void setBrandCode(String brandCode) {
+		this.brandCode = brandCode;
+	}
+	public String getEligibleReturnLocationCode() {
+		return eligibleReturnLocationCode;
+	}
+	public void setEligibleReturnLocationCode(String eligibleReturnLocationCode) {
+		this.eligibleReturnLocationCode = eligibleReturnLocationCode;
+	}
+
+
+}

omd-checkout-service/src/main/java/com/nisum/omd/domain/Order.java

+package com.nisum.omd.domain;
+
+import java.util.List;
+import java.util.Map;
+
+public class Order {
+	
+	
+	private String orderNum;
+	private String orderDate;
+	private String currency;
+	private String shipMethod;
+	private String customerId;
+	private String customerType;
+	private String gift;
+	private Promotions promotions;
+	private List<LineItem> lineItem;
+	private BillingTo billingTo;
+	private OrderCharges orderCharges;
+	private OrderTaxes orderTaxes;
+	private ShippingInfo shippingInfo;
+	private ShipTo shipTo;
+	private PaymentMethod paymentMethod;
+	
+	public Order(String orderNum, String orderDate, String currency, String shipMethod, String customerId,
+			String customerType, String gift, Promotions promotions, List<LineItem> lineItem, BillingTo billingTo,
+			OrderCharges orderCharges, OrderTaxes orderTaxes, ShippingInfo shippingInfo, ShipTo shipTo,
+			PaymentMethod paymentMethod) {
+		super();
+		this.orderNum = orderNum;
+		this.orderDate = orderDate;
+		this.currency = currency;
+		this.shipMethod = shipMethod;
+		this.customerId = customerId;
+		this.customerType = customerType;
+		this.gift = gift;
+		this.promotions = promotions;
+		this.lineItem = lineItem;
+		this.billingTo = billingTo;
+		this.orderCharges = orderCharges;
+		this.orderTaxes = orderTaxes;
+		this.shippingInfo = shippingInfo;
+		this.shipTo = shipTo;
+		this.paymentMethod = paymentMethod;
+	}
+
+	public String getOrderNum() {
+		return orderNum;
+	}
+
+	public void setOrderNum(String orderNum) {
+		this.orderNum = orderNum;
+	}
+
+	public String getOrderDate() {
+		return orderDate;
+	}
+
+	public void setOrderDate(String orderDate) {
+		this.orderDate = orderDate;
+	}
+
+	public String getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(String currency) {
+		this.currency = currency;
+	}
+
+	public String getShipMethod() {
+		return shipMethod;
+	}
+
+	public void setShipMethod(String shipMethod) {
+		this.shipMethod = shipMethod;
+	}
+
+	public String getCustomerId() {
+		return customerId;
+	}
+
+	public void setCustomerId(String customerId) {
+		this.customerId = customerId;
+	}
+
+	public String getCustomerType() {
+		return customerType;
+	}
+
+	public void setCustomerType(String customerType) {
+		this.customerType = customerType;
+	}
+
+	public String getGift() {
+		return gift;
+	}
+
+	public void setGift(String gift) {
+		this.gift = gift;
+	}
+
+	public Promotions getPromotions() {
+		return promotions;
+	}
+
+	public void setPromotions(Promotions promotions) {
+		this.promotions = promotions;
+	}
+
+	public List<LineItem> getLineItem() {
+		return lineItem;
+	}
+
+	public void setLineItem(List<LineItem> lineItem) {
+		this.lineItem = lineItem;
+	}
+
+	public BillingTo getBillingTo() {
+		return billingTo;
+	}
+
+	public void setBillingTo(BillingTo billingTo) {
+		this.billingTo = billingTo;
+	}
+
+	public OrderCharges getOrderCharges() {
+		return orderCharges;
+	}
+
+	public void setOrderCharges(OrderCharges orderCharges) {
+		this.orderCharges = orderCharges;
+	}
+
+	public OrderTaxes getOrderTaxes() {
+		return orderTaxes;
+	}
+
+	public void setOrderTaxes(OrderTaxes orderTaxes) {
+		this.orderTaxes = orderTaxes;
+	}
+
+	public ShippingInfo getShippingInfo() {
+		return shippingInfo;
+	}
+
+	public void setShippingInfo(ShippingInfo shippingInfo) {
+		this.shippingInfo = shippingInfo;
+	}
+
+	public ShipTo getShipTo() {
+		return shipTo;
+	}
+
+	public void setShipTo(ShipTo shipTo) {
+		this.shipTo = shipTo;
+	}
+
+	public PaymentMethod getPaymentMethod() {
+		return paymentMethod;
+	}
+
+	public void setPaymentMethod(PaymentMethod paymentMethod) {
+		this.paymentMethod = paymentMethod;
+	}
+	
+	
+	
+}

omd-checkout-service/src/main/java/com/nisum/omd/domain/OrderCharges.java

+package com.nisum.omd.domain;
+
+public class OrderCharges {
+	
+	private float chargeAmount;
+	private String chargeCategory;
+	private String chargeName;
+	
+	public OrderCharges(float chargeAmount, String chargeCategory, String chargeName) {
+		super();
+		this.chargeAmount = chargeAmount;
+		this.chargeCategory = chargeCategory;
+		this.chargeName = chargeName;
+	}
+
+	public float getChargeAmount() {
+		return chargeAmount;
+	}
+
+	public void setChargeAmount(float chargeAmount) {
+		this.chargeAmount = chargeAmount;
+	}
+
+	public String getChargeCategory() {
+		return chargeCategory;
+	}
+
+	public void setChargeCategory(String chargeCategory) {
+		this.chargeCategory = chargeCategory;
+	}
+
+	public String getChargeName() {
+		return chargeName;
+	}
+
+	public void setChargeName(String chargeName) {
+		this.chargeName = chargeName;
+	}
+	
+	
+
+}

omd-checkout-service/src/main/java/com/nisum/omd/domain/OrderTaxes.java

+package com.nisum.omd.domain;
+
+public class OrderTaxes {
+	
+	private String chargeCategory;
+	private String taxName;
+	private float tax;
+	private String taxCode;
+	private int taxPercentage;
+	
+	public OrderTaxes(String chargeCategory, String taxName, float tax, String taxCode, int taxPercentage) {
+		super();
+		this.chargeCategory = chargeCategory;
+		this.taxName = taxName;
+		this.tax = tax;
+		this.taxCode = taxCode;
+		this.taxPercentage = taxPercentage;
+	}
+
+	public String getChargeCategory() {
+		return chargeCategory;
+	}
+
+	public void setChargeCategory(String chargeCategory) {
+		this.chargeCategory = chargeCategory;
+	}
+
+	public String getTaxName() {
+		return taxName;
+	}
+
+	public void setTaxName(String taxName) {
+		this.taxName = taxName;
+	}
+
+	public float getTax() {
+		return tax;
+	}
+
+	public void setTax(float tax) {
+		this.tax = tax;
+	}
+
+	public String getTaxCode() {
+		return taxCode;
+	}
+
+	public void setTaxCode(String taxCode) {
+		this.taxCode = taxCode;
+	}
+
+	public int getTaxPercentage() {
+		return taxPercentage;
+	}
+
+	public void setTaxPercentage(int taxPercentage) {
+		this.taxPercentage = taxPercentage;
+	}
+	
+	
+	
+
+}

omd-checkout-service/src/main/java/com/nisum/omd/domain/PaymentMethod.java

+package com.nisum.omd.domain;
+
+import java.util.Map;
+
+public class PaymentMethod {
+	private String paymetMethod;
+	private String creditCardNo;
+	private String creditCardType;
+	private String displayCreditCardNo;
+	private String paymentStatus;
+	private Map<String,Object> paymentDetail;
+	public String getPaymetMethod() {
+		return paymetMethod;
+	}
+	public void setPaymetMethod(String paymetMethod) {
+		this.paymetMethod = paymetMethod;
+	}
+	public String getCreditCardNo() {
+		return creditCardNo;
+	}
+	public void setCreditCardNo(String creditCardNo) {
+		this.creditCardNo = creditCardNo;
+	}
+	public String getCreditCardType() {
+		return creditCardType;
+	}
+	public void setCreditCardType(String creditCardType) {
+		this.creditCardType = creditCardType;
+	}
+	public String getDisplayCreditCardNo() {
+		return displayCreditCardNo;
+	}
+	public void setDisplayCreditCardNo(String displayCreditCardNo) {
+		this.displayCreditCardNo = displayCreditCardNo;
+	}
+	public String getPaymentStatus() {
+		return paymentStatus;
+	}
+	public void setPaymentStatus(String paymentStatus) {
+		this.paymentStatus = paymentStatus;
+	}
+	public Map<String, Object> getPaymentDetail() {
+		return paymentDetail;
+	}
+	public void setPaymentDetail(Map<String, Object> paymentDetail) {
+		this.paymentDetail = paymentDetail;
+	}
+
+}

omd-checkout-service/src/main/java/com/nisum/omd/domain/Promotions.java

+package com.nisum.omd.domain;
+
+import java.util.Map;
+
+public class Promotions {
+	private Map<String,Object> PromotionDetails;
+	private Map<String,Object> Awards;
+	
+	public Map<String, Object> getPromotionDetails() {
+		return PromotionDetails;
+	}
+	public void setPromotionDetails(Map<String, Object> promotionDetails) {
+		PromotionDetails = promotionDetails;
+	}
+	public Map<String, Object> getAwards() {
+		return Awards;
+	}
+	public void setAwards(Map<String, Object> awards) {
+		Awards = awards;
+	}	
+	
+}

omd-checkout-service/src/main/java/com/nisum/omd/domain/ShipTo.java

+package com.nisum.omd.domain;
+
+public class ShipTo {
+
+	private String firstName;
+	private String lastName;
+	private String addressLine1;
+	private String city;
+	private String state;
+	private String zipCode;
+	private String country;
+	private int mobileNum;
+	private String eMailID;
+	private boolean residentialAddr;
+	
+	public ShipTo(String firstName, String lastName, String addressLine1, String city, String state, String zipCode,
+			String country, int mobileNum, String eMailID, boolean residentialAddr) {
+		super();
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.addressLine1 = addressLine1;
+		this.city = city;
+		this.state = state;
+		this.zipCode = zipCode;
+		this.country = country;
+		this.mobileNum = mobileNum;
+		this.eMailID = eMailID;
+		this.residentialAddr = residentialAddr;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public String getAddressLine1() {
+		return addressLine1;
+	}
+
+	public void setAddressLine1(String addressLine1) {
+		this.addressLine1 = addressLine1;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	public String getZipCode() {
+		return zipCode;
+	}
+
+	public void setZipCode(String zipCode) {
+		this.zipCode = zipCode;
+	}
+
+	public String getCountry() {
+		return country;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public int getMobileNum() {
+		return mobileNum;
+	}
+
+	public void setMobileNum(int mobileNum) {
+		this.mobileNum = mobileNum;
+	}
+
+	public String geteMailID() {
+		return eMailID;
+	}
+
+	public void seteMailID(String eMailID) {
+		this.eMailID = eMailID;
+	}
+
+	public boolean isResidentialAddr() {
+		return residentialAddr;
+	}
+
+	public void setResidentialAddr(boolean residentialAddr) {
+		this.residentialAddr = residentialAddr;
+	}
+	
+	
+	
+}

omd-checkout-service/src/main/java/com/nisum/omd/domain/ShippingInfo.java

+package com.nisum.omd.domain;
+
+public class ShippingInfo {
+	
+	private Boolean vaildShipTo;
+	private int maxDaysToDeliver;
+	private int minDaysToDeliver;
+	
+	
+	public ShippingInfo(Boolean vaildShipTo, int maxDaysToDeliver, int minDaysToDeliver) {
+		super();
+		this.vaildShipTo = vaildShipTo;
+		this.maxDaysToDeliver = maxDaysToDeliver;
+		this.minDaysToDeliver = minDaysToDeliver;
+	}
+	
+	public Boolean getVaildShipTo() {
+		return vaildShipTo;
+	}
+	public void setVaildShipTo(Boolean vaildShipTo) {
+		this.vaildShipTo = vaildShipTo;
+	}
+	public int getMaxDaysToDeliver() {
+		return maxDaysToDeliver;
+	}
+	public void setMaxDaysToDeliver(int maxDaysToDeliver) {
+		this.maxDaysToDeliver = maxDaysToDeliver;
+	}
+	public int getMinDaysToDeliver() {
+		return minDaysToDeliver;
+	}
+	public void setMinDaysToDeliver(int minDaysToDeliver) {
+		this.minDaysToDeliver = minDaysToDeliver;
+	}
+	
+	
+	
+
+}