From 76a4e8f023faa42685aeb580105c276a4bc22e99 Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 2 Jan 2024 00:09:27 +0530 Subject: [PATCH] Admin: add relations --- src/gisaf/models/admin.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gisaf/models/admin.py b/src/gisaf/models/admin.py index dec058e..0334191 100644 --- a/src/gisaf/models/admin.py +++ b/src/gisaf/models/admin.py @@ -9,6 +9,7 @@ import pandas as pd from gisaf.models.models_base import Model from gisaf.models.survey import Surveyor, Equipment from gisaf.models.project import Project +from gisaf.models.metadata import gisaf_admin re_file_import_record_date_expr = '^(\S+)-(\d\d\d\d)-(\d\d)-(\d\d).*$' @@ -44,7 +45,7 @@ class FileImport(Model): Give either url or path. """ __tablename__ = 'file_import' - __table_args__ = {'schema' : 'gisaf_admin'} + metadata = gisaf_admin id: int | None = Field(default=None, primary_key=True) url: str @@ -59,10 +60,13 @@ class FileImport(Model): store: str basket: str project_id: int = Field(foreign_key='project.id') + project: Project = Relationship() # ALTER TABLE gisaf_admin.file_import add column project_id INT REFERENCES gisaf_admin.project; surveyor_id: int = Field(foreign_key='surveyor.id') + surveyor: Surveyor = Relationship() # ALTER TABLE gisaf_admin.file_import add column surveyor_id INT REFERENCES gisaf_survey.surveyor; equipment_id: int = Field(foreign_key='equipment.id') + equipment: Equipment = Relationship() # ALTER TABLE gisaf_admin.file_import add column equipment_id INT REFERENCES gisaf_survey.equipment; def __str__(self): @@ -117,7 +121,7 @@ class FeatureImportData(Model): Keep track of imported data, typically from shapefiles """ __tablename__ = 'feature_import_data' - __table_args__ = {'schema' : 'gisaf_admin'} + metadata = gisaf_admin id: int | None = Field(default=None, primary_key=True) store: str = Field(index=True)