Revize 99c92c11

re #9429 Added class and funcionality for Teams table. Modified date parsing and storing. Modified View at /usb-logs/. Replaced "_" with "-" in all endpoints.

server/sql_app/crud.py

@@ -1 @@
-from sqlalchemy.orm import Session
+from datetime import datetime, date
 
+from sqlalchemy.orm import Session
+from sqlalchemy import and_
 from . import models, schemas
 
 
@@ -12 +14 @@
 
 
 def find_device(db: Session, device: schemas.DeviceBase):
-    return db.query(models.Device).filter(models.Device.product_id == device.product_id and
-                                          models.Device.vendor_id == device.vendor_id and
-                                          models.Device.serial_number == device.serial_number).first()
+    return db.query(models.Device).filter(and_(models.Device.product_id == device.product_id,
+                                          models.Device.vendor_id == device.vendor_id,
+                                          models.Device.serial_number == device.serial_number)).first()
 
 
 def create_device(db: Session, device: schemas.DeviceBase):
     db_device = models.Device(vendor_id=device.vendor_id, product_id=device.product_id,
-                              serial_number=device.serial_number)
+                              serial_number=device.serial_number, assigned=False)
     db.add(db_device)
     db.commit()
     db.refresh(db_device)
@@ -34 +36 @@
     return db.query(models.License).offset(skip).limit(limit).all()
 
 
-def create_license(db: Session, license: schemas.LicenseBase):
-    db_license = models.License(name=license.name, expiration_date=license.expiration_date)
+def create_license(db: Session, name: str, expdate: date):
+    db_license = models.License(name=name, expiration_date=expdate)
     db.add(db_license)
     db.commit()
     db.refresh(db_license)
@@ -60 +62 @@
 
 
 def find_pc(db: Session, username: str, hostname: str):
-    return db.query(models.PC).filter(models.PC.username == username and
-                                      models.PC.hostname == hostname).first()
+    return db.query(models.PC).filter(and_(models.PC.username == username,
+                                      models.PC.hostname == hostname)).first()
+
+
+def find_pcs(db: Session, pcs: []):
+    return db.query(models.PC).filter(models.PC.id.in_(pcs)).all()
 
 
 def create_pc(db: Session, user: str, host: str):
-    db_pc = models.PC(username=user, hostname=host)
+    db_pc = models.PC(username=user, hostname=host, assigned=False)
     db.add(db_pc)
     db.commit()
     db.refresh(db_pc)
     return db_pc
 
 
+def get_team(db: Session, team_id: int):
+    return db.query(models.Team).filter(models.Team.id == team_id).first()
+
+
+def get_teams(db: Session, skip: int = 0, limit: int = 100):
+    return db.query(models.Team).offset(skip).limit(limit).all()
+
+
+def create_team(db: Session, name: str):
+    db_team = models.PC(name=name)
+    db.add(db_team)
+    db.commit()
+    db.refresh(db_team)
+    return db_team
+
+
 def get_logs(db: Session, skip: int = 0, limit: int = 100):
     return db.query(models.USBLog).offset(skip).limit(limit).all()
 
@@ -80 +102 @@
     return db.query(models.USBLog).filter(models.USBLog.device_id == device_id).offset(skip).limit(limit).all()
 
 
-def create_device_logs(db: Session, item: schemas.USBTempBase, dev_id: int, pc_id: int):
-    db_log = models.USBLog(pc_id=pc_id, timestamp=item.timestamp, status=item.status, device_id=dev_id)
+def create_device_logs(db: Session, item: schemas.USBTempBase, dev_id: int, pc_id: int, date: datetime):
+    db_log = models.USBLog(pc_id=pc_id, timestamp=date, status=item.status, device_id=dev_id)
     db.add(db_log)
     db.commit()
     db.refresh(db_log)
     return db_log
+