changed the models

migrations/versions/973c23c9a386_.py

@@ -0,0 +1,43 @@
+"""empty message
+
+Revision ID: 973c23c9a386
+Revises: ba9c3c892444
+Create Date: 2021-06-21 13:20:41.830001
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '973c23c9a386'
+down_revision = 'ba9c3c892444'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('log_lag',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('logitude', sa.Float(), nullable=True),
+    sa.Column('latitude', sa.Float(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('user',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('token', sa.String(length=50), nullable=True),
+    sa.Column('name', sa.String(length=50), nullable=True),
+    sa.Column('password', sa.String(length=128), nullable=True),
+    sa.Column('admin', sa.Boolean(), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('token')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('user')
+    op.drop_table('log_lag')
+    # ### end Alembic commands ###

migrations/versions/ba9c3c892444_.py

@@ -0,0 +1,43 @@
+"""empty message
+
+Revision ID: ba9c3c892444
+Revises: c7cb3ebf9fc1
+Create Date: 2021-06-21 13:07:26.638233
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ba9c3c892444'
+down_revision = 'c7cb3ebf9fc1'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('log_lag',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('logitude', sa.Float(precision=128), nullable=True),
+    sa.Column('latitude', sa.Float(precision=128), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('user',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('token', sa.String(length=50), nullable=True),
+    sa.Column('name', sa.String(length=50), nullable=True),
+    sa.Column('password', sa.String(length=128), nullable=True),
+    sa.Column('admin', sa.Boolean(), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('token')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('user')
+    op.drop_table('log_lag')
+    # ### end Alembic commands ###

models.py

@@ -5,22 +5,36 @@
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)
 
+
 # user table
+class User(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    company_Name = db.Column(db.String(50), nullable=False)
+    email = db.Column(db.String(20), nullable=False)
+    password = db.Column(db.String(20), nullable=False)
+    files = db.relationship('File', backref='author', lazy=True)
 
+    def __repr__(self):
+        return f"User('{self.company_Name}', '{self.email}' )"
 
-class User(db.Model):
+
+#File Table
+class File(db.Model):
     id = db.Column(db.Integer, primary_key=True)
-    token = db.Column(db.String(50), unique=True)
-    name = db.Column(db.String(50))
-    password = db.Column(db.String(128))
-    admin = db.Column(db.Boolean)
+    file = db.Column(db.LargeBinary, nullable=False)
+    user = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False)
+    file_Metadatas = db.relationship('File_metadata', backref='uploadedFile', lazy=True)
+
+    def __repr__(self):
+        return f"File('{self.id}', )"
 
-class LogLag(db.Model):
+# Metadata table
+class File_metadata(db.Model):
     id = db.Column(db.Integer, primary_key=True)
-    logitude = db.Column(db.Float(128))
-    latitude = db.Column(db.Float(128))
+    file_Name = db.Column(db.String(20), nullable=False)
+    file_Type = db.Column(db.String(10), nullable=False)
+    file = db.Column(db.Integer, db.ForeignKey('file.id'), nullable=False)
 
-    def __init__(self, logitude, latitude):
-        self.logitude = logitude
-        self.latitude = latitude
+    def __repr__(self):
+        return f"File_metadata({self.file_Name}, {self.file_Type})"
 

views.py

@@ -1,30 +1,31 @@
 from flask import jsonify, json, request
 
 from core import app
-from models import db, LogLag
+# from models import db
+# , LogLag
 
 
-@app.route('/submit', methods=['POST'])
-def submit():
-    data = json.loads(request.data, strict=False)
-    new_loglat = LogLag(logitude=data['logitude'], latitude=data['latitude'])
-    db.session.add(new_loglat)
-    db.session.commit()
-    return jsonify({"message": "Logititude and Latitude submitted successfully"})
+# @app.route('/submit', methods=['POST'])
+# def submit():
+#     data = json.loads(request.data, strict=False)
+#     new_loglat = LogLag(logitude=data['logitude'], latitude=data['latitude'])
+#     db.session.add(new_loglat)
+#     db.session.commit()
+#     return jsonify({"message": "Logititude and Latitude submitted successfully"})
 
-@app.route('/retrieve', methods=['GET'])
-def getLogLat():
-    location = []
-    data = json.loads(request.data, strict=False)
-    resultt = LogLag.query.filter_by(logitude=data['logitude'], latitude=data['latitude'])
-    for log in resultt:
-        logi = log.logitude
-        lati = log.latitude
-        result = {
-            "Requested logitude" : logi,
-            "Requested latitude ": lati
-        }
-        location.append(result)
-    return jsonify( location)
+# @app.route('/retrieve', methods=['GET'])
+# def getLogLat():
+#     location = []
+#     data = json.loads(request.data, strict=False)
+#     resultt = LogLag.query.filter_by(logitude=data['logitude'], latitude=data['latitude'])
+#     for log in resultt:
+#         logi = log.logitude
+#         lati = log.latitude
+#         result = {
+#             "Requested logitude" : logi,
+#             "Requested latitude ": lati
+#         }
+#         location.append(result)
+#     return jsonify(location)