diff --git a/sql/table_user_script.sql b/sql/table_user_script.sql index 4d8146d..7001b48 100644 --- a/sql/table_user_script.sql +++ b/sql/table_user_script.sql @@ -11,7 +11,7 @@ CREATE TABLE public."T_USER" password character varying(255) COLLATE pg_catalog."default" NOT NULL, creation_date bigint NOT NULL, modification_date bigint NOT NULL, - phone bigint NOT NULL, + phone character varying(255) COLLATE pg_catalog."default" NOT NULL, association character varying(255) COLLATE pg_catalog."default" NOT NULL, verified boolean NOT NULL, approved boolean NOT NULL, diff --git a/src/main/java/blockchain/query/TransactionWrapper.java b/src/main/java/blockchain/query/TransactionWrapper.java index 93a0f28..912bc64 100644 --- a/src/main/java/blockchain/query/TransactionWrapper.java +++ b/src/main/java/blockchain/query/TransactionWrapper.java @@ -22,7 +22,7 @@ public class TransactionWrapper { //try{ Collection successful = new LinkedList<>(); - Collection failed = new LinkedList<>(); + //Collection failed = new LinkedList<>(); FabricClientWrapper fabricClientWrapper; if(user != null){ @@ -56,8 +56,9 @@ public class TransactionWrapper { logger.info("Successful transaction proposal response Txid: "+response.getTransactionID()+" from peer "+response.getPeer().getName()); successful.add(response); } else { - failed.add(response); logger.info("Failed transaction proposal response Txid: "+response.getTransactionID()+" from peer "+response.getPeer().getName()); + throw new Exception("Error during insert into Blockchain"); + //failed.add(response); } } diff --git a/src/main/java/database/user/User.java b/src/main/java/database/user/User.java index d8dfe9b..007a88a 100644 --- a/src/main/java/database/user/User.java +++ b/src/main/java/database/user/User.java @@ -21,7 +21,7 @@ public class User { @DatabaseField(canBeNull = false) private long modification_date; @DatabaseField(canBeNull = false) - private long phone; + private String phone; @DatabaseField(canBeNull = false) private String association; @DatabaseField(canBeNull = false) @@ -36,13 +36,24 @@ public class User { public User() { } - public User(String name, String firstname, String email, String password) { + public User(String name, String firstname, String email, String password, String association) { this.name = name; this.firstname = firstname; this.email = email; this.password = password; + this.association = association; } + public User(String name, String firstname, String email, String password, String phone, String association){ + this.name = name; + this.firstname = firstname; + this.email = email; + this.password = password; + this.phone = phone; + this.association = association; + } + + public User(String name, String firstname,String user_hash, String email, String password, long creation_date, long modification_date, boolean verified, boolean approved) { this.name = name; this.firstname = firstname; @@ -55,7 +66,7 @@ public class User { this.approved = approved; } - public User(String name, String firstname,String user_hash, String email, String password, long creation_date, long modification_date, long phone, String association, boolean verified, boolean approved) { + public User(String name, String firstname,String user_hash, String email, String password, long creation_date, long modification_date, String phone, String association, boolean verified, boolean approved) { this.name = name; this.firstname = firstname; this.user_hash = user_hash; @@ -69,14 +80,6 @@ public class User { this.approved = approved; } - public User(String name, String firstname, String user_hash, int phone, String association){ - this.name = name; - this.firstname = firstname; - this.user_hash = user_hash; - this.phone = phone; - this.association = association; - } - //Getters and Setters public int getUserId() { @@ -130,8 +133,8 @@ public class User { this.modification_date = modification_date; } - public long getPhone(){return phone;} - public void setPhone(int phone){this.phone=phone;} + public String getPhone(){return phone;} + public void setPhone(String phone){this.phone=phone;} public String getAssociation(){return association;} public void setAssociation(){this.association=association;} diff --git a/src/main/java/restImplementation/BlockchainQueryImplementation.java b/src/main/java/restImplementation/BlockchainQueryImplementation.java index dda3c39..cf4486b 100644 --- a/src/main/java/restImplementation/BlockchainQueryImplementation.java +++ b/src/main/java/restImplementation/BlockchainQueryImplementation.java @@ -63,7 +63,7 @@ public class BlockchainQueryImplementation { return wallets; } - + /* public String sendTransaction(String sourceWallet, String destinationWallet, Double amount){ TransactionWrapper transactionWrapper = new TransactionWrapper(); BlockEvent.TransactionEvent transactionEvent = transactionWrapper.sendTransaction("transaction",new String[]{sourceWallet,destinationWallet,amount.toString()}); @@ -91,6 +91,7 @@ public class BlockchainQueryImplementation { TransactionWrapper transactionWrapper = new TransactionWrapper(); transactionWrapper.sendTransaction("transferWallet", new String[]{walletHash,userHash}); } + */ diff --git a/src/main/java/restImplementation/UserImplementation.java b/src/main/java/restImplementation/UserImplementation.java index 2404e8b..436952b 100644 --- a/src/main/java/restImplementation/UserImplementation.java +++ b/src/main/java/restImplementation/UserImplementation.java @@ -19,6 +19,10 @@ public class UserImplementation { user.setUser_hash(hashPassword(user.getName()+user.getEmail()+user.getFirstname()+user.getAssociation())); //REGISTER IN BLOCKCHAIN + if(user.getPhone()==null){ + user.setPhone("0000000000"); + } + String[] userInfos = new String[]{user.getUser_hash(),user.getName(),user.getFirstname(),""+user.getPhone(),user.getAssociation()}; transactionWrapper.sendTransaction("registerUser",userInfos); diff --git a/src/test/java/blockchain/query/User/DeleteUserTest.java b/src/test/java/blockchain/query/User/DeleteUserTest.java index 07c6382..518f5be 100644 --- a/src/test/java/blockchain/query/User/DeleteUserTest.java +++ b/src/test/java/blockchain/query/User/DeleteUserTest.java @@ -19,7 +19,7 @@ public class DeleteUserTest { try{ TransactionWrapper transactionWrapper = new TransactionWrapper(); String functionName = "deleteUser"; - String[] args = new String[]{"usera"}; + String[] args = new String[]{"$2a$10$6vjtplKcFKKaE0HKGd.8VOJi0xugc5Ojbf9m5LqyZ8mzU5nfcxt5."}; BlockEvent.TransactionEvent responseEvent = transactionWrapper.sendTransaction(functionName,args); logger.info("Event transaction id : "+responseEvent.getTransactionID()); //print transaction id }catch (Exception e){ diff --git a/src/test/java/blockchain/query/User/ReadUserTest.java b/src/test/java/blockchain/query/User/ReadUserTest.java index 8e33794..29885cb 100644 --- a/src/test/java/blockchain/query/User/ReadUserTest.java +++ b/src/test/java/blockchain/query/User/ReadUserTest.java @@ -22,7 +22,7 @@ public class ReadUserTest { try{ QueryWrapper queryWrapper = new QueryWrapper(); String functionName = "readUser"; - String[] args = new String[]{"usera"}; + String[] args = new String[]{"$2a$10$6vjtplKcFKKaE0HKGd.8VOJi0xugc5Ojbf9m5LqyZ8mzU5nfcxt5."}; String response = queryWrapper.sendQuery(functionName,args); if(response != null){ JsonReader reader = Json.createReader(new StringReader(response)); diff --git a/src/test/java/database/DatabaseUserImplementationTest.java b/src/test/java/database/DatabaseUserImplementationTest.java index 383a024..5add4ad 100644 --- a/src/test/java/database/DatabaseUserImplementationTest.java +++ b/src/test/java/database/DatabaseUserImplementationTest.java @@ -7,6 +7,7 @@ import restImplementation.DatabaseUserImplementation; @Ignore public class DatabaseUserImplementationTest { + /* @Test public void TestUser(){ try { @@ -20,4 +21,5 @@ public class DatabaseUserImplementationTest { e.printStackTrace(); } } + */ } \ No newline at end of file diff --git a/src/test/java/restImplementation/UserImplementationTest.java b/src/test/java/restImplementation/UserImplementationTest.java new file mode 100644 index 0000000..2528a3a --- /dev/null +++ b/src/test/java/restImplementation/UserImplementationTest.java @@ -0,0 +1,53 @@ +package restImplementation; + +import database.user.User; +import org.apache.log4j.Logger; +import org.junit.Ignore; +import org.junit.Test; +import restService.StringResponse; +import java.util.Map; + +@Ignore +public class UserImplementationTest { + private static Logger logger = Logger.getLogger(UserImplementationTest.class); + + @Test + public void RegisterUserWithoutPhone() { + User userTest = new User("TotoName","TotoFirstName","TotoEmail@gmail.com","totoPassword1234$","gonette"); + UserImplementation userImplementation = new UserImplementation(); + + try{ + Map response = userImplementation.registerUser(userTest); + logger.info("response is: "+response.get("response")); + if(Boolean.parseBoolean(response.get("response"))){ + StringResponse responseS = new StringResponse("Ok",response.get("userHash")); + logger.info("StringResponse is: "+responseS.getResponse()+". User hash: "+responseS.getUserHash()); + } + } catch (Exception e){ + logger.warn("Error: "+e); + } + + + } + + + /* + @Test + public void RegisterUserWithPhone() { + User userTest = new User("TataName","TataFirstName","TataEmail@gmail.com","tataPassword1234$","0607080900","gonette"); + UserImplementation userImplementation = new UserImplementation(); + + try{ + Map responseTest = userImplementation.registerUser(userTest); + logger.info("response is: "+responseTest.get("response")); + if(Boolean.parseBoolean(responseTest.get("response"))){ + StringResponse responseS = new StringResponse("Ok",responseTest.get("userHash")); + logger.info("StringResponse is: "+responseS.getResponse()+". User hash: "+responseS.getUserHash()); + } + }catch (Exception e){ + logger.warn("Error: "+e); + } + } + */ + +} diff --git a/src/test/java/restImplementation/UserLoggerTest.java b/src/test/java/restImplementation/UserLoggerTest.java index e46eb0f..72d2526 100644 --- a/src/test/java/restImplementation/UserLoggerTest.java +++ b/src/test/java/restImplementation/UserLoggerTest.java @@ -8,6 +8,7 @@ import java.util.Map; @Ignore public class UserLoggerTest { + /* @Test public void testLoggerUser(){ try{ @@ -22,4 +23,5 @@ public class UserLoggerTest { e.printStackTrace(); } } + */ }