Skip to content
Snippets Groups Projects
Commit fcdcaa3e authored by Ethan Allen-Harris's avatar Ethan Allen-Harris Committed by Ethan Allen-Harris
Browse files

updating branch for merge to develop

parent bbaaf1e7
No related branches found
No related tags found
4 merge requests!56tags will be saved to userFavTags table (needs user ID of current logged in user),!22Branch Update,!19created signUp page and form that sends data to controller,!17Removal of "AUTO_INCREMENT" on AdminTypes id field since there will only ever...
...@@ -23,11 +23,15 @@ public class registerUserServiceStatic implements registerUserService{ ...@@ -23,11 +23,15 @@ public class registerUserServiceStatic implements registerUserService{
twoFactorMethods.setTwoFactorMethodId(ID); twoFactorMethods.setTwoFactorMethodId(ID);
twoFactorMethods.setTwoFactorMethodName("None"); twoFactorMethods.setTwoFactorMethodName("None");
twoFactorMethodsRepo.save(twoFactorMethods);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
Users newUser = new Users(accountDTO.getName(), accountDTO.getSurname(), accountDTO.getEmail(), accountDTO.getPassword(), Users newUser = new Users(accountDTO.getName(), accountDTO.getSurname(), accountDTO.getEmail(), accountDTO.getPassword(),
"", "", "", "",
LocalDateTime.now().format(formatter), twoFactorMethods); LocalDateTime.now().format(formatter), twoFactorMethods);
Users users = usersRepo.save(newUser); usersRepo.save(newUser);
System.out.println(usersRepo.findById(newUser.getUserId()));
} }
} }
...@@ -241,4 +241,6 @@ INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_ ...@@ -241,4 +241,6 @@ INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_
INSERT INTO Admin_Types (Admin_Type_Id, Admin_Type_Name) VALUES (1,'User'); INSERT INTO Admin_Types (Admin_Type_Id, Admin_Type_Name) VALUES (1,'User');
INSERT INTO Admin_Types (Admin_Type_Id, Admin_Type_Name) VALUES (2,'Business Admin'); INSERT INTO Admin_Types (Admin_Type_Id, Admin_Type_Name) VALUES (2,'Business Admin');
INSERT INTO Admin_Types (Admin_Type_Id, Admin_Type_Name) VALUES (3,'Super Admin'); INSERT INTO Admin_Types (Admin_Type_Id, Admin_Type_Name) VALUES (3,'Super Admin');
\ No newline at end of file
INSERT INTO Tags (Tag_Name) VALUES ('Football');
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment