Merge remote-tracking branch 'origin/master'

# Conflicts:
#	readme.md

readme.md

@@ -39,16 +39,16 @@ In Header click on Tool -> Query Tool --> and paste the below query
 
 -- DROP TABLE public.offer_lookup;
 
-CREATE TABLE public.offer_lookup
+CREATE TABLE offer_lookup
 ( 
-    id INTEGER, COLLATE pg_catalog."default" NOT NULL,
-    store_id text COLLATE pg_catalog."default" NOT NULL,
-    terminal text COLLATE pg_catalog."default" NOT NULL,
-    offer_type text COLLATE pg_catalog."default" NOT NULL,
-    offer_id text COLLATE pg_catalog."default" NOT NULL,
-    pre_condition text COLLATE pg_catalog."default" NOT NULL,
-    CONSTRAINT "OfferLookup_pkey" PRIMARY KEY (id, offer_type,offer_id)
-)
+	id INTEGER,
+	store_id VARCHAR(200),
+	terminal VARCHAR(200),
+	offer_type VARCHAR(200),
+	offer_id INTEGER ,
+	pre_condition VARCHAR (100),
+	PRIMARY KEY(id, offer_type,offer_id)
+);
 
 TABLESPACE pg_default;
 
@@ -105,27 +105,26 @@ INSERT INTO endofsale VALUES ( uuid_generate_v4()  ,
 
 ```bash
 
--- Table: public.offer_meta_data
+-- Table: public.offer_metadata
 
--- DROP TABLE public.offer_meta_data;
+-- DROP TABLE public.offer_metadata;
 
-CREATE TABLE public.offer_meta_data
+CREATE TABLE offer_metadata
 (
-    offer_id INTEGER COLLATE pg_catalog."default" NOT NULL,
-    eligibility text COLLATE pg_catalog."default" NOT NULL,
-    discount_type text COLLATE pg_catalog."default" NOT NULL,
-    status text COLLATE pg_catalog."default" NOT NULL,
-    start_time timestamp with time zone NOT NULL,
-    end_time timestamp with time zone NOT NULL,
-    offer_desc text COLLATE pg_catalog."default" NOT NULL,
-    offer_type text COLLATE pg_catalog."default" NOT NULL,
-    rcpt_text text COLLATE pg_catalog."default" NOT NULL,
-    CONSTRAINT offer_meta_data_pkey PRIMARY KEY (offer_id)
-)
+	offer_id serial PRIMARY KEY,
+	eligibilty VARCHAR(200),
+	discount_type VARCHAR(200),
+	status VARCHAR(50) NOT NULL,
+	start_time VARCHAR(20),
+	end_time VARCHAR(20),
+	offer_desc VARCHAR (355),
+	offer_type INTEGER,
+	rcpt_text VARCHAR (200)
+);
 
 TABLESPACE pg_default;
 
-ALTER TABLE public.offer_meta_data
+ALTER TABLE public.offer_metadata
     OWNER to "user";
 
 
@@ -140,24 +139,24 @@ ALTER TABLE public.offer_meta_data
 dummy data
 ==========
 
-INSERT INTO public.offer_meta_data(
+INSERT INTO public.offer_metadata(
 	 offer_id, eligibility, discount_type, status, start_time,end_time,
 	offer_desc,offer_type,rcpt_text)
 	VALUES (1,'elgibility','dicounted','Active','2020-04-14 19:10:25','2020-04-15 19:10:25',
 			'30 percent','5','RCPT TXT');
 
-INSERT INTO public.offer_meta_data(
+INSERT INTO public.offer_metadata(
 	 offer_id, eligibility, discount_type, status, start_time,end_time,
 	offer_desc,offer_type,rcpt_text)
 	VALUES (2,'elgibility','dicounted','InActive','2020-04-14 19:10:25','2020-04-15 19:10:25',
 			'20 percent','5','RCPT TXT');
 
-INSERT INTO public.offer_meta_data(
+INSERT INTO public.offer_metadata(
 	 offer_id, eligibility, discount_type, status, start_time,end_time,
 	offer_desc,offer_type,rcpt_text)
 	VALUES (3,'elgibility','dicounted','Active','2020-04-15 19:10:25','2020-04-16 19:10:25',
 			'10 percent','5','RCPT TXT');
-INSERT INTO public.offer_meta_data(
+INSERT INTO public.offer_metadata(
 	 offer_id, eligibility, discount_type, status, start_time,end_time,
 	offer_desc,offer_type,rcpt_text)
 	VALUES (4,'elgibility','dicounted','Active','2020-04-1 19:10:25','2020-04-15 19:10:25',

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

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = false)
 @Entity
-@Table(name = "offer_metadata")
+@Table(name = "offer_meta_data")
 public class OfferMeta {
 
     @Id

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

@@ -30,7 +30,6 @@ public class OfferCallingPEService {
     @Autowired
     private ClientService clientService;
 
-
     @Autowired
     private OfferMetaDataRepo offerMetaDataRepo;