QRouland/M2OLA
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TG-104 : Ajout sec_id dans la BDD

Browse Source
This commit is contained in:
Clément ARNAUDEAU 2017-01-27 12:05:02 +01:00
parent 28ae3bf218
commit dc8b8a4bda
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
API_Interfaces.txt
View File

@ -21,6 +21,6 @@ UserInfoAPI (api/userInfo)
####################### #######################
GET -> Get the current logged user, return None if no one is connected GET -> Get the current logged user, return None if no one is connected
Out: Out:
200 -> USER = <USER_OBJECT>|None : Dictionnary containing user infos or None 200 -> USER = <USER_OBJECT>|None : Dictionary containing user infos or None

23
backend/OLA.mysql
View File

@ -23,14 +23,15 @@ CREATE TABLE IF NOT EXISTS SETTINGS
CREATE TABLE IF NOT EXISTS `GROUP` CREATE TABLE IF NOT EXISTS `GROUP`
( (
id BIGINT NOT NULL AUTO_INCREMENT, id BIGINT NOT NULL AUTO_INCREMENT,
`name` VARCHAR(128) NOT NULL UNIQUE, `name` VARCHAR(128) NOT NULL UNIQUE,
`year` CHARACTER(4) NOT NULL, `year` CHARACTER(4) NOT NULL,
class_short VARCHAR(128) NOT NULL, class_short VARCHAR(128) NOT NULL,
class_long VARCHAR(512), class_long VARCHAR(512),
department VARCHAR(256), department VARCHAR(256),
resp_id BIGINT, resp_id BIGINT,
ressources_dir VARCHAR(512), sec_id BIGINT,
ressources_dir VARCHAR(512),
PRIMARY KEY(id) PRIMARY KEY(id)
) ENGINE = INNODB; ) ENGINE = INNODB;
@ -96,7 +97,11 @@ CREATE TABLE IF NOT EXISTS HASHTABLE
# Create FKs # Create FKs
ALTER TABLE `GROUP` ALTER TABLE `GROUP`
ADD FOREIGN KEY (resp_id) ADD FOREIGN KEY (resp_id)
REFERENCES `USER`(id) REFERENCES `USER`(id);
ALTER TABLE `GROUP`
ADD FOREIGN KEY (sec_id)
REFERENCES `USER` (id)
; ;
ALTER TABLE TUTORSHIP ALTER TABLE TUTORSHIP

3
backend/tests/api/test_Auth.py
View File

@ -18,7 +18,8 @@ class AuthTestCase(unittest.TestCase):
res = query.execute() res = query.execute()
cls.uid = res.lastrowid cls.uid = res.lastrowid
query = GROUP.insert().values(name="test", year="2017", class_long="classe toto", class_short="toto", query = GROUP.insert().values(name="test", year="2017", class_long="classe toto", class_short="toto",
department="plop", ressources_dir="/plop/toto", resp_id=cls.uid) department="plop", ressources_dir="/plop/toto", resp_id=cls.uid,
sec_id=cls.uid)
res = query.execute() res = query.execute()
cls.gid = res.lastrowid cls.gid = res.lastrowid
query = TUTORSHIP.insert().values(student_id=cls.uid, ptutor_id=cls.uid, group_id=cls.gid) query = TUTORSHIP.insert().values(student_id=cls.uid, ptutor_id=cls.uid, group_id=cls.gid)