Skip to content
Snippets Groups Projects
Commit e57c44d1 authored by Seb Barnard's avatar Seb Barnard :speech_balloon:
Browse files

Merge branch 'develop' into 'issueTwelve' 

Develop

See merge request !29
parents c7694c16 affaa70b
No related branches found
No related tags found
6 merge requests!56tags will be saved to userFavTags table (needs user ID of current logged in user),!39Develop,!33Develop,!32Branch Update,!31Merging almost finished product, needs sessions to be complete for testing,!29Develop
Hide whitespace changes
Inline Side-by-side
Showing
with 156 additions and 177 deletions
src/main/java/com/example/clientproject/data/rewards/Rewards.java
+ 0
− 7
View file @ e57c44d1
......@@ -23,11 +23,4 @@ public class Rewards {
private long rewardId;
private String rewardName;
private int rewardStampLocation;
@ManyToOne
@JoinColumn(name="Stamp_Board_Id", nullable=false)
private StampBoards stampBoard;
@ManyToMany(mappedBy = "rewardsList")
private List<Shops> shopsList;
}
src/main/java/com/example/clientproject/data/shops/Shops.java
+ 4
− 7
View file @ e57c44d1
......@@ -2,6 +2,7 @@ package com.example.clientproject.data.shops;
import com.example.clientproject.data.converters.TinyIntToBoolean;
import com.example.clientproject.data.rewards.Rewards;
import com.example.clientproject.data.stampBoards.StampBoards;
import com.example.clientproject.data.tags.Tags;
import com.example.clientproject.data.users.Users;
import lombok.AllArgsConstructor;
......@@ -65,11 +66,7 @@ public class Shops {
)
private List<Tags> shopTags;
@ManyToMany
@JoinTable(
name="Reward_Shop_Links",
joinColumns=@JoinColumn(name="Shop_Id"),
inverseJoinColumns = @JoinColumn(name="Reward_Id")
)
private List<Rewards> rewardsList;
@OneToOne
@JoinColumn(name="Stamp_Board_Id")
private StampBoards stampBoard;
}
src/main/java/com/example/clientproject/data/shops/ShopsRepo.java
+ 3
− 0
View file @ e57c44d1
......@@ -66,4 +66,7 @@ public interface ShopsRepo extends JpaRepository<Shops, Long> {
*/
@Query("select s from Shops s where s.shopActive = false")
List<Shops> findInactiveShops();
@Query("select s from Shops s where s.stampBoard.stampBoardId = ?1")
Optional<Shops> findByStampId(long stampId);
}
src/main/java/com/example/clientproject/data/stampBoards/StampBoards.java
+ 7
− 3
View file @ e57c44d1
package com.example.clientproject.data.stampBoards;
import com.example.clientproject.data.rewards.Rewards;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.*;
import java.util.Set;
/**
* StampBoards Entity
......@@ -21,4 +21,8 @@ public class StampBoards {
@GeneratedValue
private long stampBoardId;
private int stampBoardSize;
@OneToMany
@JoinColumn(name="Stamp_Board_Id")
private Set<Rewards> rewards;
}
src/main/java/com/example/clientproject/data/stampBoards/StampBoardsRepo.java
+ 10
− 0
View file @ e57c44d1
package com.example.clientproject.data.stampBoards;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
import java.util.Optional;
/**
* JPA Repository for the "StampBoards" Entity
......@@ -21,4 +23,12 @@ public interface StampBoardsRepo extends JpaRepository<StampBoards, Long> {
* @return - the object
*/
StampBoards save(StampBoards stampBoards);
/**
* Find a stamp board by a given Id value
* @param id - the id to search by
* @return - an optional containing the stampboard found
*/
@Query("SELECT s from StampBoards s where s.stampBoardId = ?1")
Optional<StampBoards> findById(long id);
}
src/main/resources/database/Data Script/script.sql
+ 31
− 31
View file @ e57c44d1
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Shraya","BELUSKO","ShrayaBELUSKO@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Saleem","GETTI","SaleemGETTI@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Saajid","EFREHN","SaajidEFREHN@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Karaleigh","HAJEC","KaraleighHAJEC@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Sari","YDICK","SariYDICK@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Marie","LASUCCI","MarieLASUCCI@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Tieanna","ACCINI","TieannaACCINI@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Noel","MCKASSON","NoelMCKASSON@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Henrich","MANIA","HenrichMANIA@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Mckenna","CHWEGMANN","MckennaCHWEGMANN@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Shraya','BELUSKO','ShrayaBELUSKO@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Saleem','GETTI','SaleemGETTI@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Saajid','EFREHN','SaajidEFREHN@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Karaleigh','HAJEC','KaraleighHAJEC@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Sari','YDICK','SariYDICK@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Marie','LASUCCI','MarieLASUCCI@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Tieanna','ACCINI','TieannaACCINI@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Noel','MCKASSON','NoelMCKASSON@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Henrich','MANIA','HenrichMANIA@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Mckenna','CHWEGMANN','MckennaCHWEGMANN@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',1);
INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (2,1,1);
INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (3,1,1);
INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (4,1,1);
......@@ -18,16 +18,16 @@ INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (8,1,1);
INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (9,1,1);
INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (10,1,1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Jonathon","ATLEY","JonathonATLEY@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Carine","OLOMITO","CarineOLOMITO@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Manuel","PROCACCINI","ManuelPROCACCINI@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Leon","AUF","LeonAUF@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Charmian","OFFBECK","CharmianOFFBECK@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Carolann","BANDA","CarolannBANDA@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Soul","AHBAR","SoulAHBAR@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Kismet","BURROUS","KismetBURROUS@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Fatou","OMBO","FatouOMBO@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Blaine","OBARD","BlaineOBARD@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Jonathon','ATLEY','JonathonATLEY@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Carine','OLOMITO','CarineOLOMITO@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Manuel','PROCACCINI','ManuelPROCACCINI@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Leon','AUF','LeonAUF@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Charmian','OFFBECK','CharmianOFFBECK@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',1);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Carolann','BANDA','CarolannBANDA@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Soul','AHBAR','SoulAHBAR@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Kismet','BURROUS','KismetBURROUS@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Fatou','OMBO','FatouOMBO@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Blaine','OBARD','BlaineOBARD@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',1);
INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (11,1,2);
INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (12,1,2);
INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (13,1,2);
......@@ -38,17 +38,17 @@ INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (17,1,2);
INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (18,1,2);
INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (19,1,2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ("Amatul","PINNER","AmatulPINNER@email.com","52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72","testImage.png",2);
INSERT INTO Users (User_First_Name, User_Last_Name, User_Email, User_Password, User_Profile_Picture, Two_Factor_Method_Id) VALUES ('Amatul','PINNER','AmatulPINNER@email.com','52c0b42072654c96e249ccba358c0babb20c8829950241a092be12d69f2fbe72','testImage.png',2);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active) VALUES ("Roob Group","","RoobGroup.com","24811","CD Congo The Democratic Republic Of The","shopPic.png",0);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active) VALUES ("Marks - Durgan","","MarksDurgan.com","18079","EG Egypt","shopPic.png",0);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active) VALUES ("Fay - Koepp","","FayKoepp.com","12140","KP Korea Democratic Peoples Republic Of","shopPic.png",0);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active) VALUES ("Mueller, Lueilwitz and Roberts","","MuellerLueilwitzandRoberts.com","20157","CZ Czech Republic","shopPic.png",1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active) VALUES ("Balistreri, Aufderhar and Huels","","BalistreriAufderharandHuels.com","31289","BS Bahamas","shopPic.png",0);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active) VALUES ("Murray, Barrows and Tillman","","MurrayBarrowsandTillman.com","745","HK Hong Kong","shopPic.png",1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active) VALUES ("Weimann - Hauck","","WeimannHauck.com","39160","SZ Swaziland","shopPic.png",1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active) VALUES ("Douglas, Reichert and Kutch","","DouglasReichertandKutch.com","2093","SC Seychelles","shopPic.png",1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active) VALUES ("Schoen Group","","SchoenGroup.com","10783","FR France","shopPic.png",0);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active) VALUES ("Homenick and Sons","","HomenickandSons.com","14948","SM San Marino","shopPic.png",0);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active, Stamp_Board_Id) VALUES ('Roob Group','','RoobGroup.com','24811','CD Congo The Democratic Republic Of The','shopPic.png',0,1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active, Stamp_Board_Id) VALUES ('Marks - Durgan','','MarksDurgan.com','18079','EG Egypt','shopPic.png',0,1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active, Stamp_Board_Id) VALUES ('Fay - Koepp','','FayKoepp.com','12140','KP Korea Democratic Peoples Republic Of','shopPic.png',0,1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active, Stamp_Board_Id) VALUES ('Mueller, Lueilwitz and Roberts','','MuellerLueilwitzandRoberts.com','20157','CZ Czech Republic','shopPic.png',1,1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active, Stamp_Board_Id) VALUES ('Balistreri, Aufderhar and Huels','','BalistreriAufderharandHuels.com','31289','BS Bahamas','shopPic.png',0,1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active, Stamp_Board_Id) VALUES ('Murray, Barrows and Tillman','','MurrayBarrowsandTillman.com','745','HK Hong Kong','shopPic.png',1,1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active, Stamp_Board_Id) VALUES ('Weimann - Hauck','','WeimannHauck.com','39160','SZ Swaziland','shopPic.png',1,1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active, Stamp_Board_Id) VALUES ('Douglas, Reichert and Kutch','','DouglasReichertandKutch.com','2093','SC Seychelles','shopPic.png',1,1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active, Stamp_Board_Id) VALUES ('Schoen Group','','SchoenGroup.com','10783','FR France','shopPic.png',0,1);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Image, Shop_Active, Stamp_Board_Id) VALUES ('Homenick and Sons','','HomenickandSons.com','14948','SM San Marino','shopPic.png',0,1);
src/main/resources/database/WeekTwoERD.png 0 → 100644
+ 0
− 0
View file @ e57c44d1
src/main/resources/database/WeekTwoERD.png

74.9 KiB

src/main/resources/database/schema.sql
+ 67
− 80
View file @ e57c44d1
......@@ -16,22 +16,6 @@ CREATE TABLE IF NOT EXISTS `mydb`.`Two_Factor_Methods` (
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Shops`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`Shops` (
`Shop_Id` INT NOT NULL AUTO_INCREMENT,
`Shop_Name` VARCHAR(45) NOT NULL,
`Shop_Description` VARCHAR(250) NOT NULL,
`Shop_Website` VARCHAR(45) NOT NULL,
`Shop_Earnings` INT NOT NULL,
`Shop_Countries` VARCHAR(150) NOT NULL,
`Shop_Image` VARCHAR(150),
`Shop_Active` TINYINT NOT NULL,
PRIMARY KEY (`Shop_Id`))
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Admin_Types`
-- -----------------------------------------------------
......@@ -64,33 +48,6 @@ CREATE TABLE IF NOT EXISTS `mydb`.`Users` (
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`User_Permissions`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`User_Permissions` (
`User_Permission_Id` INT NOT NULL AUTO_INCREMENT,
`User_Id` INT NOT NULL,
`Shop_Id` INT,
`Admin_Type_Id` INT NOT NULL,
PRIMARY KEY (`User_Permission_Id`, `User_Id`, `Shop_Id`, `Admin_Type_Id`),
CONSTRAINT `fk_User_Permissions_Users1`
FOREIGN KEY (`User_Id`)
REFERENCES `mydb`.`Users` (`User_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION,
CONSTRAINT `fk_User_Permissions_Shops1`
FOREIGN KEY (`Shop_Id`)
REFERENCES `mydb`.`Shops` (`Shop_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION,
CONSTRAINT `fk_User_Permissions_Admin_Types1`
FOREIGN KEY (`Admin_Type_Id`)
REFERENCES `mydb`.`Admin_Types` (`Admin_Type_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Tags`
-- -----------------------------------------------------
......@@ -121,26 +78,6 @@ CREATE TABLE IF NOT EXISTS `mydb`.`User_Favourite_Tags` (
)
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Shop_Tag_Links`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`Shop_Tag_Links` (
`Shop_Tag_Link_Id` INT NOT NULL AUTO_INCREMENT,
`Shop_Id` INT NOT NULL,
`Tag_Id` INT NOT NULL,
PRIMARY KEY (`Shop_Tag_Link_Id`, `Shop_Id`, `Tag_Id`),
CONSTRAINT `fk_Shop_Tag_Links_Shops1`
FOREIGN KEY (`Shop_Id`)
REFERENCES `mydb`.`Shops` (`Shop_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION,
CONSTRAINT `fk_Shop_Tag_Links_Tags1`
FOREIGN KEY (`Tag_Id`)
REFERENCES `mydb`.`Tags` (`Tag_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Stamp_Boards`
......@@ -168,25 +105,73 @@ CREATE TABLE IF NOT EXISTS `mydb`.`Rewards` (
ON UPDATE NO ACTION)
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Shops`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`Shops` (
`Shop_Id` INT NOT NULL AUTO_INCREMENT,
`Shop_Name` VARCHAR(45) NOT NULL,
`Shop_Description` VARCHAR(250) NOT NULL,
`Shop_Website` VARCHAR(45) NOT NULL,
`Shop_Earnings` INT NOT NULL,
`Shop_Countries` VARCHAR(150) NOT NULL,
`Shop_Image` VARCHAR(150),
`Shop_Active` TINYINT NOT NULL,
`Stamp_Board_Id` INT NOT NULL,
PRIMARY KEY (`Shop_Id`, `Stamp_Board_Id`),
CONSTRAINT `fk_Shops_Stamp_Boards1`
FOREIGN KEY (`Stamp_Board_Id`)
REFERENCES `mydb`.`Stamp_Boards` (`Stamp_Board_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Reward_Shop_Links`
-- Table `mydb`.`Shop_Tag_Links`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`Reward_Shop_Links` (
`Reward_Shop_Link_ID` INT NOT NULL AUTO_INCREMENT,
`Shop_Id` INT NOT NULL,
`Reward_Id` INT NOT NULL,
PRIMARY KEY (`Reward_Shop_Link_ID`, `Shop_Id`, `Reward_Id`),
CONSTRAINT `fk_Reward_Shop_Links_Shops1`
FOREIGN KEY (`Shop_Id`)
REFERENCES `mydb`.`Shops` (`Shop_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION,
CONSTRAINT `fk_Reward_Shop_Links_Rewards1`
FOREIGN KEY (`Reward_Id`)
REFERENCES `mydb`.`Rewards` (`Reward_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
CREATE TABLE IF NOT EXISTS `mydb`.`Shop_Tag_Links` (
`Shop_Tag_Link_Id` INT NOT NULL AUTO_INCREMENT,
`Shop_Id` INT NOT NULL,
`Tag_Id` INT NOT NULL,
PRIMARY KEY (`Shop_Tag_Link_Id`, `Shop_Id`, `Tag_Id`),
CONSTRAINT `fk_Shop_Tag_Links_Shops1`
FOREIGN KEY (`Shop_Id`)
REFERENCES `mydb`.`Shops` (`Shop_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION,
CONSTRAINT `fk_Shop_Tag_Links_Tags1`
FOREIGN KEY (`Tag_Id`)
REFERENCES `mydb`.`Tags` (`Tag_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`User_Permissions`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`User_Permissions` (
`User_Permission_Id` INT NOT NULL AUTO_INCREMENT,
`User_Id` INT NOT NULL,
`Shop_Id` INT,
`Admin_Type_Id` INT NOT NULL,
PRIMARY KEY (`User_Permission_Id`, `User_Id`, `Shop_Id`, `Admin_Type_Id`),
CONSTRAINT `fk_User_Permissions_Users1`
FOREIGN KEY (`User_Id`)
REFERENCES `mydb`.`Users` (`User_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION,
CONSTRAINT `fk_User_Permissions_Shops1`
FOREIGN KEY (`Shop_Id`)
REFERENCES `mydb`.`Shops` (`Shop_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION,
CONSTRAINT `fk_User_Permissions_Admin_Types1`
FOREIGN KEY (`Admin_Type_Id`)
REFERENCES `mydb`.`Admin_Types` (`Admin_Type_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB;
......@@ -236,7 +221,9 @@ CREATE TABLE IF NOT EXISTS `mydb`.`User_Stamp_Boards` (
INSERT INTO two_factor_methods (`Two_Factor_Method_Id`, `Two_Factor_Method_Name`) VALUES (1, 'None');
INSERT INTO two_factor_methods (`Two_Factor_Method_Id`, `Two_Factor_Method_Name`) VALUES (2, 'GAuth');
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('','','',0,'',0);
INSERT INTO stamp_boards (Stamp_Board_Id, Stamp_Board_Size) VALUES (1, 0);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('','','',0,'',0,1);
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');
......
src/test/resources/schema-test-h2.sql
+ 24
− 39
View file @ e57c44d1
SET MODE MYSQL;
SET IGNORECASE=TRUE;
-- -----------------------------------------------------
-- -----------------------------------------------------
-- Schema mydb
......@@ -19,21 +16,6 @@ CREATE TABLE IF NOT EXISTS `mydb`.`Two_Factor_Methods` (
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Shops`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`Shops` (
`Shop_Id` INT NOT NULL AUTO_INCREMENT,
`Shop_Name` VARCHAR(45) NOT NULL,
`Shop_Website` VARCHAR(45) NOT NULL,
`Shop_Earnings` INT NOT NULL,
`Shop_Countries` VARCHAR(150) NOT NULL,
`Shop_Image` VARCHAR(150),
`Shop_Active` TINYINT NOT NULL,
PRIMARY KEY (`Shop_Id`))
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Admin_Types`
-- -----------------------------------------------------
......@@ -63,7 +45,7 @@ CREATE TABLE IF NOT EXISTS `mydb`.`Users` (
REFERENCES `mydb`.`Two_Factor_Methods` (`Two_Factor_Method_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB;
ENGINE = InnoDB;
-- -----------------------------------------------------
......@@ -102,7 +84,6 @@ CREATE TABLE IF NOT EXISTS `mydb`.`Tags` (
PRIMARY KEY (`Tag_Id`))
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`User_Favourite_Tags`
-- -----------------------------------------------------
......@@ -120,8 +101,7 @@ CREATE TABLE IF NOT EXISTS `mydb`.`User_Favourite_Tags` (
FOREIGN KEY (`User_Id`)
REFERENCES `mydb`.`Users` (`User_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION
)
ON UPDATE NO ACTION)
ENGINE = InnoDB;
......@@ -172,23 +152,23 @@ CREATE TABLE IF NOT EXISTS `mydb`.`Rewards` (
ON UPDATE NO ACTION)
ENGINE = InnoDB;
-- -----------------------------------------------------
-- Table `mydb`.`Reward_Shop_Links`
-- Table `mydb`.`Shops`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `mydb`.`Reward_Shop_Links` (
`Reward_Shop_Link_ID` INT NOT NULL AUTO_INCREMENT,
`Shop_Id` INT NOT NULL,
`Reward_Id` INT NOT NULL,
PRIMARY KEY (`Reward_Shop_Link_ID`, `Shop_Id`, `Reward_Id`),
CONSTRAINT `fk_Reward_Shop_Links_Shops1`
FOREIGN KEY (`Shop_Id`)
REFERENCES `mydb`.`Shops` (`Shop_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION,
CONSTRAINT `fk_Reward_Shop_Links_Rewards1`
FOREIGN KEY (`Reward_Id`)
REFERENCES `mydb`.`Rewards` (`Reward_Id`)
CREATE TABLE IF NOT EXISTS `mydb`.`Shops` (
`Shop_Id` INT NOT NULL AUTO_INCREMENT,
`Shop_Name` VARCHAR(45) NOT NULL,
`Shop_Description` VARCHAR(250) NOT NULL,
`Shop_Website` VARCHAR(45) NOT NULL,
`Shop_Earnings` INT NOT NULL,
`Shop_Countries` VARCHAR(150) NOT NULL,
`Shop_Image` VARCHAR(150),
`Shop_Active` TINYINT NOT NULL,
`Stamp_Board_Id` INT NOT NULL,
PRIMARY KEY (`Shop_Id`, `Stamp_Board_Id`),
CONSTRAINT `fk_Shops_Stamp_Boards1`
FOREIGN KEY (`Stamp_Board_Id`)
REFERENCES `mydb`.`Stamp_Boards` (`Stamp_Board_Id`)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB;
......@@ -236,11 +216,16 @@ CREATE TABLE IF NOT EXISTS `mydb`.`User_Stamp_Boards` (
ON UPDATE NO ACTION)
ENGINE = InnoDB;
INSERT INTO two_factor_methods (`Two_Factor_Method_Id`, `Two_Factor_Method_Name`) VALUES (1, 'None');
INSERT INTO two_factor_methods (`Two_Factor_Method_Id`, `Two_Factor_Method_Name`) VALUES (2, 'GAuth');
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('','',0,'',0);
INSERT INTO stamp_boards (Stamp_Board_Id, Stamp_Board_Size) VALUES (1, 0);
INSERT INTO Shops (Shop_Name, Shop_Description, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('','','',0,'',0,1);
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 (3,'Super Admin');
\ No newline at end of file
INSERT INTO Admin_Types (Admin_Type_Id, Admin_Type_Name) VALUES (3,'Super Admin');
INSERT INTO Tags (Tag_Name) VALUES ('Football');
\ No newline at end of file
src/test/resources/script-test-h2.sql
+ 10
− 10
View file @ e57c44d1
......@@ -320,13 +320,13 @@ INSERT INTO User_Permissions (User_ID, Shop_ID, Admin_Type_Id) VALUES (158,1,3);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('Leffler Group','LefflerGroup.com','36951','WF Wallis And Futuna',1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('Ondricka, Hermann and Zulauf','OndrickaHermannandZulauf.com','21303','LK Sri Lanka',1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('Hand, Parker and Haley','HandParkerandHaley.com','17361','PH Philippines',1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('Hills Group','HillsGroup.com','23720','LB Lebanon',2);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('Reinger, Stanton and Block','ReingerStantonandBlock.com','32575','CR Costa Rica',2);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('Reilly - Dicki','ReillyDicki.com','9218','VE Venezuela',2);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('Collins Group','CollinsGroup.com','36562','MC Monaco',2);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('Fadel, Morar and Harris','FadelMorarandHarris.com','38127','ZM Zambia',2);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('Hayes - Lehner','HayesLehner.com','2919','SG Singapore',1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active) VALUES ('Walsh, Maggio and Maggio','WalshMaggioandMaggio.com','3875','MT Malta',2);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('Leffler Group','LefflerGroup.com','36951','WF Wallis And Futuna',1,1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('Ondricka, Hermann and Zulauf','OndrickaHermannandZulauf.com','21303','LK Sri Lanka',1,1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('Hand, Parker and Haley','HandParkerandHaley.com','17361','PH Philippines',1,1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('Hills Group','HillsGroup.com','23720','LB Lebanon',2,1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('Reinger, Stanton and Block','ReingerStantonandBlock.com','32575','CR Costa Rica',2,1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('Reilly - Dicki','ReillyDicki.com','9218','VE Venezuela',2,1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('Collins Group','CollinsGroup.com','36562','MC Monaco',2,1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('Fadel, Morar and Harris','FadelMorarandHarris.com','38127','ZM Zambia',2,1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('Hayes - Lehner','HayesLehner.com','2919','SG Singapore',1,1);
INSERT INTO Shops (Shop_Name, Shop_Website, Shop_Earnings, Shop_Countries, Shop_Active, Stamp_Board_Id) VALUES ('Walsh, Maggio and Maggio','WalshMaggioandMaggio.com','3875','MT Malta',2,1);
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment