From 2aca3bee153836a52f55897604da67b00eb01b11 Mon Sep 17 00:00:00 2001
From: deflax <daniel@deflax.net>
Date: Mon, 1 Apr 2024 19:44:11 +0300
Subject: [PATCH] rename all remaining pid columns to id columns

---
 src/forest/models.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/forest/models.py b/src/forest/models.py
index 35ba3d4..80ffde4 100644
--- a/src/forest/models.py
+++ b/src/forest/models.py
@@ -28,7 +28,7 @@ class Permission:
 
 class Role(db.Model):
     __tablename__ = 'roles'
-    pid = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String, unique=True)
     default = db.Column(db.Boolean, default=False, index=True)
     permissions = db.Column(db.Integer)
@@ -60,7 +60,7 @@ class User(db.Model, UserMixin):
     active = db.Column(db.Boolean(), default=True, nullable=False)
     confirmed = db.Column(db.Boolean, default=False)
  
-    role_id = db.Column(db.ForeignKey('roles.pid')) #FK
+    role_id = db.Column(db.ForeignKey('roles.id')) #FK
     password_hash = db.Column(db.String)
     tokens = db.Column(db.Text)
 
@@ -125,7 +125,7 @@ class User(db.Model, UserMixin):
 
     def generate_confirmation_token(self, expiration=86400):
         s = Serializer(current_app.config['SECRET_KEY'], expiration)
-        return s.dumps({'confirm': self.pid})
+        return s.dumps({'confirm': self.id})
 
     def confirm(self, token):
         s = Serializer(current_app.config['SECRET_KEY'])
@@ -133,7 +133,7 @@ class User(db.Model, UserMixin):
             data = s.loads(token)
         except:
             return False
-        if data.get('confirm') != self.pid:
+        if data.get('confirm') != self.id:
             return False
         self.confirmed = True
         db.session.add(self)
@@ -142,7 +142,7 @@ class User(db.Model, UserMixin):
 
     def generate_reset_token(self, expiration=86400):
         s = Serializer(current_app.config['SECRET_KEY'], expiration)
-        return s.dumps({'reset': self.pid})
+        return s.dumps({'reset': self.id})
 
     def reset_password(self, token, new_password):
         s = Serializer(current_app.config['SECRET_KEY'])
@@ -150,7 +150,7 @@ class User(db.Model, UserMixin):
             data = s.loads(token)
         except:
             return False
-        if data.get('reset') != self.pid:
+        if data.get('reset') != self.id:
             return False
         self.password = new_password
         db.session.add(self)
@@ -185,7 +185,7 @@ class User(db.Model, UserMixin):
         return self.is_authenticated
 
     def get_id(self):
-        return str(self.pid)
+        return str(self.id)
 
     def __repr__(self):
         return '<User %r>' % self.email