Merge branch 'features1.4/rest' into develop-1.4

sql/sequence_transaction_script.sql

@@ -0,0 +1,8 @@
+-- SEQUENCE: public."T_TRANSACTION_transactionId_seq"
+
+-- DROP SEQUENCE public."T_TRANSACTION_transactionId_seq";
+
+CREATE SEQUENCE public."T_TRANSACTION_transactionId_seq";
+
+ALTER SEQUENCE public."T_TRANSACTION_transactionId_seq"
+    OWNER TO monnethicadmin;

sql/sequence_user_script.sql

@@ -0,0 +1,8 @@
+-- SEQUENCE: public."T_USER_user_id_seq"
+
+-- DROP SEQUENCE public."T_USER_user_id_seq";
+
+CREATE SEQUENCE public."T_USER_user_id_seq";
+
+ALTER SEQUENCE public."T_USER_user_id_seq"
+    OWNER TO monnethicadmin;

sql/sequence_wallet_script.sql

@@ -0,0 +1,8 @@
+-- SEQUENCE: public."T_WALLET_wallet_id_seq"
+
+-- DROP SEQUENCE public."T_WALLET_wallet_id_seq";
+
+CREATE SEQUENCE public."T_WALLET_wallet_id_seq";
+
+ALTER SEQUENCE public."T_WALLET_wallet_id_seq"
+    OWNER TO monnethicadmin;

sql/table_transaction_script.sql

@@ -0,0 +1,22 @@
+-- Table: public."T_TRANSACTION"
+
+-- DROP TABLE public."T_TRANSACTION";
+
+CREATE TABLE public."T_TRANSACTION"
+(
+    "transactionId" integer NOT NULL DEFAULT nextval('"T_TRANSACTION_transactionId_seq"'::regclass),
+    "transactionDate" bigint NOT NULL,
+    "transactionFrom" character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    "transactionTo" character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    "transactionHash" character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    "transactionAmount" numeric(255,5) NOT NULL,
+    "transactionUnit" character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    CONSTRAINT "T_TRANSACTION_pkey" PRIMARY KEY ("transactionId")
+)
+WITH (
+    OIDS = FALSE
+)
+TABLESPACE pg_default;
+
+ALTER TABLE public."T_TRANSACTION"
+    OWNER to monnethicadmin;

sql/table_user_script.sql

@@ -0,0 +1,27 @@
+-- Table: public."T_USER"
+
+-- DROP TABLE public."T_USER";
+
+CREATE TABLE public."T_USER"
+(
+    user_id integer NOT NULL DEFAULT nextval('"T_USER_user_id_seq"'::regclass),
+    name character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    firstname character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    email character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    password character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    creation_date bigint NOT NULL,
+    modification_date bigint NOT NULL,
+    phone bigint NOT NULL,
+    association character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    verified boolean NOT NULL,
+    approved boolean NOT NULL,
+    user_hash character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    CONSTRAINT "T_USER_pkey" PRIMARY KEY (user_id)
+)
+WITH (
+    OIDS = FALSE
+)
+TABLESPACE pg_default;
+
+ALTER TABLE public."T_USER"
+    OWNER to monnethicadmin;

sql/table_wallet_script.sql

@@ -0,0 +1,23 @@
+-- Table: public."T_WALLET"
+
+-- DROP TABLE public."T_WALLET";
+
+CREATE TABLE public."T_WALLET"
+(
+    wallet_id integer NOT NULL DEFAULT nextval('"T_WALLET_wallet_id_seq"'::regclass),
+    wallet_hash character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    user_hash character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    type character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    sold numeric(255,5) NOT NULL,
+    creation_date bigint NOT NULL,
+    modification_date bigint NOT NULL,
+    is_active boolean NOT NULL,
+    CONSTRAINT "T_WALLET_pkey" PRIMARY KEY (wallet_id)
+)
+WITH (
+    OIDS = FALSE
+)
+TABLESPACE pg_default;
+
+ALTER TABLE public."T_WALLET"
+    OWNER to monnethicadmin;

src/main/java/database/DatabaseHelper.java

@@ -5,8 +5,10 @@ import com.j256.ormlite.support.ConnectionSource;
 
 public class DatabaseHelper {
     private static final String DATABASE_NAME = "monnethic";
-    private static final String DATABASE_USER = "postgres";
-    private static final String DATABASE_PWD = "L-*q~Ytaha{;u+7yJ8";
+    //private static final String DATABASE_USER = "postgres";
+    private static final String DATABASE_USER = "monnethicadmin";
+    //private static final String DATABASE_PWD = "L-*q~Ytaha{;u+7yJ8";
+    private static final String DATABASE_PWD = "vHEQszGXcJ6;/)}z!V";
     private final static String DATABASE_URL = "jdbc:postgresql://37.187.101.44:5432/"+DATABASE_NAME;
 
     public ConnectionSource setupDatabaseConnection(){

src/main/java/database/Wallet/Wallet.java

@@ -6,6 +6,8 @@ import com.j256.ormlite.table.DatabaseTable;
 
 @DatabaseTable(tableName = "T_WALLET")
 public class Wallet {
+    @DatabaseField(canBeNull = false)
+    private int wallet_id;
     @DatabaseField(canBeNull = false)
     private String wallet_hash;
     @DatabaseField(canBeNull = false)
@@ -41,6 +43,14 @@ public class Wallet {
         this.is_active = isActive;
     }
 
+    public int getWallet_id() {
+        return wallet_id;
+    }
+
+    public void setWallet_id(int wallet_id) {
+        this.wallet_id = wallet_id;
+    }
+
     public String getWallet_hash() {
         return wallet_hash;
     }

src/main/java/database/user/User.java

@@ -7,7 +7,7 @@ import com.j256.ormlite.table.DatabaseTable;
 @DatabaseTable(tableName = "T_USER")
 public class User {
     @DatabaseField(generatedId = true)
-    private int userId;
+    private int user_id;
     @DatabaseField(canBeNull = false)
     private String name;
     @DatabaseField(canBeNull = false)
@@ -80,9 +80,9 @@ public class User {
 
     //Getters and Setters
     public int getUserId() {
-        return userId;
+        return user_id;
     }
-    public void setUserId(int userId) {this.userId = userId;}
+    public void setUserId(int userId) {this.user_id = userId;}
 
     public String getName() {
         return name;
@@ -154,7 +154,7 @@ public class User {
     @Override
     public String toString() {
         return "User{" +
-                "userId=" + userId +
+                "userId=" + user_id +
                 ", name='" + name + '\'' +
                 ", firstname='" + firstname + '\'' +
                 ", email='" + email + '\'' +