New commit

src/models.py

@@ -112,11 +112,17 @@ class PendingTagLink(Base):
     """Database model for pending tag link requests."""
     __tablename__ = "pending_tag_links"
     id = Column(Integer, primary_key=True, index=True)
-    tag_id = Column(String, nullable=False)
-    target_user_id = Column(String, nullable=False)
+    device_id_fk = Column(Integer, ForeignKey("devices.id"), nullable=False)
     target_user_type = Column(SQLAlchemyEnum(TargetUserType), nullable=False)
+    target_identifier = Column(String, nullable=False)
     initiated_by_user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    expires_at = Column(DateTime, nullable=False)
     created_at = Column(DateTime, default=datetime.utcnow)
+    
+    # Relationships
+    device = relationship("Device", foreign_keys=[device_id_fk])
+    initiated_by = relationship("User", foreign_keys=[initiated_by_user_id])
+
 
 
 class DeviceLog(Base):
@@ -256,6 +262,31 @@ class PrepareDeviceRequest(BaseModel):
     user_id_str: str # Can be student_id or username
     user_type: UserTypeEnum
 
+
+class PrepareTagLinkRequest(BaseModel):
+    """Request to prepare a device for tag linking."""
+    device_identifier: str = Field(..., description="The device ID that will scan for tags")
+    target_user_type: TargetUserType = Field(..., description="Type of user (STUDENT or STAFF_ADMIN)")
+    target_identifier: str = Field(..., description="Student ID or username to link the tag to")
+
+class PendingTagLinkResponse(BaseModel):
+    """Response model for pending tag link information."""
+    id: int
+    device_id_fk: int
+    target_user_type: TargetUserType
+    target_identifier: str
+    initiated_by_user_id: int
+    expires_at: datetime
+    created_at: datetime
+    
+    class Config:
+        from_attributes = True
+
+class ScannedTagSubmit(BaseModel):
+    """Request when submitting a scanned tag for linking."""
+    scanned_tag_id: str = Field(..., description="The scanned RFID tag ID")
+
+
 # --- New RFID Models ---
 class RfidScanRequest(BaseModel):
     """Request body for the unified RFID scan endpoint."""