Revize 2229e0e1

re #9416 Fixed timestamp.

server/docker-compose.yml

@@ -13 +13 @@
       - POSTGRES_PASSWORD=postgres
       - "TZ=Europe/Prague"
     ports:
-      - "5433:5432"
+      - "5432:5432"
 
   app:
     build: .

server/sql_app/api/devices.py

@@ -12 +12 @@
 models.Base.metadata.create_all(bind=engine)
 templates = Jinja2Templates(directory="templates/devices")
 
-device = APIRouter()
+device = APIRouter(prefix="/api/v1")
 
 # Dependency
 def get_db():
@@ -23 +23 @@
         db.close()
 
 
[e-mail]("/devices-web/", response_class=HTMLResponse)
[e-mail]("/devices-web", response_class=HTMLResponse)
 async def read_devices(request: Request, skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     devices = crud.get_devices(db, skip=skip, limit=limit)
     return templates.TemplateResponse("devices.html", {"request": request, "devs": devices})
 
 
[e-mail]("/device/", response_model=schemas.Device)
[e-mail]("/device", response_model=schemas.Device)
 def create_device(device: schemas.DeviceCreate, db: Session = Depends(get_db)):
     print(crud.create_device(db=db, device=device))
 
 
[e-mail]("/devices/", response_model=List[schemas.Device])
[e-mail]("/devices", response_model=List[schemas.Device])
 def read_devices(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     devices = crud.get_devices(db, skip=skip, limit=limit)
     return devices

server/sql_app/api/licenses.py

@@ -13 +13 @@
 models.Base.metadata.create_all(bind=engine)
 templates = Jinja2Templates(directory="templates/licenses")
 
-licenses = APIRouter()
+licenses = APIRouter(prefix="/api/v1")
 
 
 # Dependency
@@ -25 +25 @@
         db.close()
 
 
[e-mail]("/licenses-web/", response_class=HTMLResponse)
[e-mail]("/licenses-web", response_class=HTMLResponse)
 async def read_pcs(request: Request, skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     licenses = crud.get_licenses(db, skip=skip, limit=limit)
     return templates.TemplateResponse("licenses.html", {"request": request, "licenses": licenses})
 
 
[e-mail]("/license/", response_model=schemas.License)
[e-mail]("/license", response_model=schemas.License)
 def create_license(license: schemas.LicenseCreate, db: Session = Depends(get_db)):
     print(crud.create_license(db=db, name=license.name, expdate=license.expiration_date))
 
 
[e-mail]("/licenses/", response_model=List[schemas.License])
[e-mail]("/licenses", response_model=List[schemas.License])
 def read_licenses(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     licenses = crud.get_licenses(db, skip=skip, limit=limit)
     return licenses
 
 
[e-mail]("/device-license/", response_model=schemas.DeviceLicense)
[e-mail]("/device-license", response_model=schemas.DeviceLicense)
 def create_device_license(device_license: schemas.DeviceLicenseCreate, db: Session = Depends(get_db)):
     print(crud.create_device_license(db=db, device_license=device_license))

server/sql_app/api/pcs.py

@@ -11 +11 @@
 models.Base.metadata.create_all(bind=engine)
 templates = Jinja2Templates(directory="templates/pcs")
 
-pcs = APIRouter()
+pcs = APIRouter(prefix="/api/v1")
 
 
 # Dependency
@@ -23 +23 @@
         db.close()
 
 
[e-mail]("/pcs-web/", response_class=HTMLResponse)
[e-mail]("/pcs-web", response_class=HTMLResponse)
 async def read_pcs(request: Request, skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     pcs = crud.get_pcs(db, skip=skip, limit=limit)
     return templates.TemplateResponse("pcs.html", {"request": request, "pcs": pcs})
 
 
[e-mail]("/pc/", response_model=schemas.PC)
[e-mail]("/pc", response_model=schemas.PC)
 def create_pc(pc: schemas.PCCreate, db: Session = Depends(get_db)):
     print(crud.create_pc(db=db, user=pc.username, host=pc.hostname))
 
 
[e-mail]("/pcs/", response_model=List[schemas.PC])
[e-mail]("/pcs", response_model=List[schemas.PC])
 def read_pcs(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     pcs = crud.get_pcs(db, skip=skip, limit=limit)
     return pcs

server/sql_app/api/teams.py

@@ -12 +12 @@
 models.Base.metadata.create_all(bind=engine)
 templates = Jinja2Templates(directory="templates/teams")
 
-teams = APIRouter()
+teams = APIRouter(prefix="/api/v1")
 
 # Dependency
 def get_db():
@@ -23 +23 @@
         db.close()
 
 
[e-mail]("/teams-web/", response_class=HTMLResponse)
[e-mail]("/teams-web", response_class=HTMLResponse)
 async def read_devices(request: Request, skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     teams = crud.get_teams(db, skip=skip, limit=limit)
     return templates.TemplateResponse("teams.html", {"request": request, "teams": teams})
 
 
[e-mail]("/team/", response_model=schemas.Team)
[e-mail]("/team", response_model=schemas.Team)
 def create_device(team: schemas.TeamCreate, db: Session = Depends(get_db)):
     print(crud.create_team(db=db, name=team.name))
 
 
[e-mail]("/teams/", response_model=List[schemas.Device])
[e-mail]("/teams", response_model=List[schemas.Device])
 def read_devices(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     teams = crud.get_teams(db, skip=skip, limit=limit)
     return teams

server/sql_app/api/usb_logs.py

@@ -12 +12 @@
 models.Base.metadata.create_all(bind=engine)
 templates = Jinja2Templates(directory="templates/usb-logs")
 
-usblogs = APIRouter()
+usblogs = APIRouter(prefix="/api/v1")
 
 
 # Dependency
@@ -24 +24 @@
         db.close()
 
 
[e-mail]("/logs-web/", response_class=HTMLResponse)
[e-mail]("/logs-web", response_class=HTMLResponse)
 async def read_logs(request: Request, skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     logs = crud.get_logs(db, skip=skip, limit=limit)
     return templates.TemplateResponse("logs.html", {"request": request, "logs": logs})
 
 
[e-mail]("/usb-logs/", response_model=schemas.USBLog)
[e-mail]("/usb-logs", response_model=schemas.USBLog)
 def create_device_logs(log: schemas.USBTempBase, db: Session = Depends(get_db)):
     dev = crud.find_device(db, log.device)
-    dat = datetime.strptime(log.timestamp, '%Y-%m-%d %H:%M:%S.%f')
+    dat = datetime.strptime(log.timestamp, '%Y-%m-%d %H:%M:%S')
     if dev is None:
         dev = crud.create_device(db=db, device=log.device)
     pc = crud.find_pc(db, log.username, log.hostname)
@@ -43 +43 @@
     print(crud.create_device_logs(db=db, item=log, dev_id=dev.id, pc_id=pc.id, date=dat))
 
 
[e-mail]("/logs/", response_model=List[schemas.USBLog])
[e-mail]("/logs", response_model=List[schemas.USBLog])
 def read_logs(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     items = crud.get_logs(db, skip=skip, limit=limit)
     return items

server/sql_app/database.py

@@ -7 +7 @@
     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@10.5.0.5:5432/usb_api_db"
 
 engine = create_engine(
     SQLALCHEMY_DATABASE_URL

server/sql_app/main.py

@@ -7 +7 @@
 from fastapi import FastAPI
 
 
-app = FastAPI(root_path="/api/v1")
+app = FastAPI()
 app.include_router(device)
 app.include_router(licenses)
 app.include_router(pcs)