Revize ef87a1d2

re #9429 Repaired running the server from server directory.

server/sql_app/api/devices.py

@@ -2 +2 @@
 
 from fastapi import Depends, FastAPI, HTTPException, APIRouter
 from sqlalchemy.orm import Session
-from ...sql_app import crud, models, schemas
+from sql_app import crud, models, schemas
 from ..database import SessionLocal, engine
 from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse

server/sql_app/api/licenses.py

@@ -3 +3 @@
 from fastapi import Depends, FastAPI, HTTPException, APIRouter
 from sqlalchemy.orm import Session
 from datetime import date
-from ...sql_app import crud, models, schemas
+from sql_app import crud, models, schemas
 from ..database import SessionLocal, engine
 from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse

server/sql_app/api/pcs.py

@@ -1 +1 @@
 from typing import List
 from fastapi import Depends, FastAPI, HTTPException, APIRouter
 from sqlalchemy.orm import Session
-from ...sql_app import crud, models, schemas
+from sql_app import crud, models, schemas
 from ..database import SessionLocal, engine
 from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse

server/sql_app/api/teams.py

@@ -2 +2 @@
 
 from fastapi import Depends, FastAPI, HTTPException, APIRouter
 from sqlalchemy.orm import Session
-from ...sql_app import crud, models, schemas
+from sql_app import crud, models, schemas
 from ..database import SessionLocal, engine
 from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse

server/sql_app/api/usb_logs.py

@@ -2 +2 @@
 from fastapi import Depends, FastAPI, HTTPException, APIRouter, Form
 from datetime import datetime
 from sqlalchemy.orm import Session
-from ...sql_app import crud, models, schemas
+from sql_app import crud, models, schemas
 from ..database import SessionLocal, engine
 from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse

server/sql_app/database.py

@@ -1 +1 @@
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
-
+'''
 SQLALCHEMY_DATABASE_URL = "sqlite:///./sql_app.db"
 engine = create_engine(
     SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
 )
-#SQLALCHEMY_DATABASE_URL = "postgresql://postgres:postgres@localhost:5432/usb_api_db"
 '''
+SQLALCHEMY_DATABASE_URL = "postgresql://postgres:postgres@localhost:5432/usb_api_db"
+
 engine = create_engine(
     SQLALCHEMY_DATABASE_URL
 )
-'''
+
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 Base = declarative_base()
 
+#psycopg2

server/sql_app/main.py

@@ -1 +1 @@
 import uvicorn
-from server.sql_app.api.devices import device
-from server.sql_app.api.licenses import licenses
-from server.sql_app.api.pcs import pcs
-from server.sql_app.api.usb_logs import usblogs
-from server.sql_app.api.teams import teams
+from sql_app.api.devices import device
+from sql_app.api.licenses import licenses
+from sql_app.api.pcs import pcs
+from sql_app.api.usb_logs import usblogs
+from sql_app.api.teams import teams
 from fastapi import FastAPI
 
 

server/sql_app/models.py

@@ -44 +44 @@
     __tablename__ = "devices_licenses"
 
     id = Column(Integer, primary_key=True, index=True)
-    device_id = Column(String, ForeignKey("devices.id"))
-    license_id = Column(String, ForeignKey("licenses.id"))
+    device_id = Column(Integer, ForeignKey("devices.id"))
+    license_id = Column(Integer, ForeignKey("licenses.id"))
     assigned_datetime = Column(String, index=True, nullable=False)
 
     device_lic = relationship("Device", back_populates="licenses")