fixed-database

api/.env

@@ -1,3 +1,3 @@
 SECRET_KEY='DEVElOPMENTONLY'
-SQLALCHEMY_DATABASE_URI='postgresql://usr:pwd@postgres:5433/master'
+SQLALCHEMY_DATABASE_URI='postgresql://usr:pwd@postgres:5432/master'
 

api/init.sql

@@ -0,0 +1,22 @@
+CREATE TABLE "User" (
+    "id" SERIAL UNIQUE PRIMARY KEY,
+    "session_id" uuid UNIQUE,
+    "email" TEXT UNIQUE,
+    "password" uuid
+);
+
+CREATE TABLE "Files" (
+    "id" SERIAL UNIQUE PRIMARY KEY,
+    "user_id" INTEGER UNIQUE,
+    "location" TEXT,
+    "bug_name" TEXT,
+    "file_name" TEXT,
+    FOREIGN KEY ("user_id") REFERENCES "User"("id")a
+);
+
+CREATE TABLE "Species" (
+    "id" SERIAL UNIQUE PRIMARY KEY,
+    "name" TEXT,
+    "description" TEXT,
+    "remove" BOOLEAN
+);

api/pollination/models.py

@@ -1,7 +1,6 @@
 '''
 Contains the table representations of the database
 '''
-
 import string
 import random
 from uuid import uuid4
@@ -29,12 +28,40 @@ class User(db.Model):
     id = db.Column(db.String(32), primary_key=True,
                    unique=True, default=get_uuid)
     alt_id = db.Column(db.String(6), unique=True, default=get_basic_id)
+    username = db.Column(db.Text, unique=True)
 
-    team_name = db.Column(db.String(20), unique=True)
-    track_value = db.relationship('Track_value', back_populates='team')
-
-    user = db.relationship('User', back_populates='team')
+    file = db.Relationship('File', back_populates='user',
+                           cascade='all, delete', passive_deletes=True)
     # Determine what access level the function is at
 
     def __repr__(self):
-        return f"Team('{self.team_name}','{ self.alt_id }')"
+        return f"Team('{self.name}','{ self.alt_id }')"
+
+
+class File(db.Model):
+    '''
+    Correlates the file location with the User
+    '''
+    __tablename__ = "File"
+    id = db.Column(db.Integer, primary_key=True, unique=True)
+    user_id = db.Column(db.String(32), db.ForeignKey('User.id',
+                                                     ondelete="CASCADE"), nullable=False)
+    location = db.Column(db.Text)
+    bug_name = db.Column(db.Text)
+    file_name = db.Column(db.Text)
+    user = db.Relationship('User', back_populates='file')
+
+    def __repr__(self):
+        return f"File('{self.location}', '{self.bug_name}', \
+                      '{self.file_name}')"
+
+
+class Species(db.Model):
+    __tablename__ = "Species"
+    id = db.Column(db.Integer, primary_key=True, unique=True)
+    plant = db.Column(db.Boolean)
+    name = db.Column(db.Text)
+    description = db.Column(db.Text)
+    native = db.Column(db.Boolean)
+    location = db.Column(db.Text)
+    image_location = db.Column(db.Text)

api/setup.py

@@ -0,0 +1,10 @@
+from pollination import db
+from pollination.models import User
+
+if __name__ == "__main__":
+    db.drop_all()
+    db.create_all()
+
+    user = User(name="moo", email="testing@gmail.com")
+    db.session.add(user)
+    db.session.commit()