SoftwareEngineering/DualHub
4
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

DB refactoring

Browse Source
This commit is contained in:
Paul Martin
2024-10-07 15:12:06 +02:00
parent 4c5a0c52d0
commit 34822bfc93
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
init.py
View File

@ -49,7 +49,7 @@ class User(UserMixin, db.Model):
Datenbank-Modell für User. Datenbank-Modell für User.
""" """
__tablename__ = 'user' __tablename__ = 'user'
id = db.Column(db.Integer, ForeignKey('dualis.uid', ondelete='CASCADE'), primary_key=True) id = db.Column(db.Integer, primary_key=True)
email = db.Column(db.String(255), unique=True) email = db.Column(db.String(255), unique=True)
name = db.Column(db.String(255)) name = db.Column(db.String(255))
kurs = db.Column(db.String(15)) kurs = db.Column(db.String(15))
@ -61,7 +61,7 @@ class Dualis(db.Model):
""" """
__tablename__ = 'dualis' __tablename__ = 'dualis'
token = db.Column(db.String(255), unique=True) token = db.Column(db.String(255), unique=True)
uid = db.Column(db.Integer, primary_key=True) uid = db.Column(db.Integer, ForeignKey('user.id', ondelete='CASCADE'), primary_key=True)
token_created = db.Column(db.Integer) token_created = db.Column(db.Integer)
semester = db.Column(db.String(15)) semester = db.Column(db.String(15))
@ -71,7 +71,7 @@ class Semesterlist(db.Model):
Datenbank-Modell für Semester-Liste. Datenbank-Modell für Semester-Liste.
""" """
__tablename__ = 'semesterlist' __tablename__ = 'semesterlist'
uid = db.Column(db.Integer, ForeignKey('dualis.uid', ondelete='CASCADE')) uid = db.Column(db.Integer, ForeignKey('user.id', ondelete='CASCADE'))
semestername = db.Column(db.String(25)) semestername = db.Column(db.String(25))
semesterid = db.Column(db.String(15)) semesterid = db.Column(db.String(15))
itemid = db.Column(db.Integer, primary_key=True) itemid = db.Column(db.Integer, primary_key=True)
@ -92,7 +92,7 @@ class HiddenVL(db.Model):
Datenbank-Modell für ausgeblendete Vorlesungen. Datenbank-Modell für ausgeblendete Vorlesungen.
""" """
__tablename__ = 'hiddenVL' __tablename__ = 'hiddenVL'
uid = db.Column(db.Integer, ForeignKey('dualis.uid', ondelete='CASCADE')) uid = db.Column(db.Integer, ForeignKey('user.id', ondelete='CASCADE'))
eventid = db.Column(db.String(255)) eventid = db.Column(db.String(255))
id = db.Column(db.String(255), primary_key=True) id = db.Column(db.String(255), primary_key=True)
name = db.Column(db.String(255)) name = db.Column(db.String(255))

1
routing.py
View File

@ -326,6 +326,7 @@ def initRoutes(app: Flask):
name = email[vorname:(vorname + nachname)].capitalize() name = email[vorname:(vorname + nachname)].capitalize()
new_user = User(email=email, name=name, id=hashedID) new_user = User(email=email, name=name, id=hashedID)
db.session.add(new_user) db.session.add(new_user)
db.session.commit()
cookie = tokenAndCookie[1] cookie = tokenAndCookie[1]
newDualis = Dualis(uid=hashedID, token=tokenAndCookie[0], token_created=int(time.time())) newDualis = Dualis(uid=hashedID, token=tokenAndCookie[0], token_created=int(time.time()))