Merge branch 'main' into docker-ci

datagora-erasme · Dec 19, 2023 · edf1b96 · edf1b96
2 parents fa7f8b2 + c91d323
commit edf1b96
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/app/models.py b/app/models.py
@@ -112,11 +112,13 @@ class Projects(db.Model):
     user_id = db.Column(db.Integer, db.ForeignKey(schema + ".users.id"))
     model_id = db.Column(db.Integer, db.ForeignKey(schema + ".documents.id"))
     csv_id = db.Column(db.Integer, db.ForeignKey(schema + ".documents.id"))
+    emprise_id = db.Column(db.Integer, db.ForeignKey(schema + ".documents.id"))
 
     # Object links 
     user = db.relationship("Users", foreign_keys=user_id)
     model = db.relationship("Documents", foreign_keys=model_id, viewonly=True)
     csv = db.relationship("Documents", foreign_keys=csv_id, viewonly=True)
+    emprise = db.relationship("Documents", foreign_keys=emprise_id, viewonly=True)
 
     def __str__(self):
         return (
@@ -140,6 +142,8 @@ def __str__(self):
             + str(self.model_id)
             + '" csv_id="'
             + str(self.csv_id)
+            + '" emprise_id="'
+            + str(self.emprise_id)
             + '">'
         )
 

diff --git a/app/modules/projects/views.py b/app/modules/projects/views.py
@@ -133,10 +133,13 @@ def create():
               description: ratio
             model_id:
               type: integer
-              description: ratio
+              description: model document
             csv_id:
               type: integer
-              description: ratio
+              description: csv document
+            emprise_id:
+              type: integer
+              description: emprise document
     responses:
       200:
         description: OK
@@ -155,7 +158,7 @@ def create():
     if currentUser:
         # Get Body of request
         form = request.json
-        if 'model_id' in form and 'csv_id' in form and 'name' in form and 'bbox' in form and 'nb_plaques_h' in form and 'nb_plaques_v' in form and 'ratio' in form:
+        if 'name' in form and 'bbox' in form and 'nb_plaques_h' in form and 'nb_plaques_v' in form and 'ratio' in form:
             newproject = Projects(
                 date_create=datetime.datetime.utcnow(),
                 user_id=currentUser['user_id'],
@@ -164,8 +167,9 @@ def create():
                 nb_plaques_h=form['nb_plaques_h'],
                 nb_plaques_v=form['nb_plaques_v'],
                 ratio=form['ratio'],
-                model_id=form['model_id'],
-                csv_id=form['csv_id']
+                model_id=form['model_id'] if 'model_id' in form else None,
+                csv_id=form['csv_id'] if 'csv_id' in form else None,
+                emprise_id=form['emprise_id'] if 'emprise_id' in form else None
             )
             db.session.add(newproject)
             db.session.commit()

diff --git a/app/schemas.py b/app/schemas.py
@@ -48,6 +48,7 @@ class ProjectsSchema(ma.SQLAlchemyAutoSchema):
     user = ma.Nested("UserSchema", only=("id",), many=False)
     model = ma.Nested("DocumentOnlySchema", only=("id",), many=False)
     csv = ma.Nested("DocumentOnlySchema", only=("id",), many=False)
+    emprise = ma.Nested("DocumentOnlySchema", only=("id",), many=False)
     class Meta:
         model = Projects
 

diff --git a/sql/create-tables.sql b/sql/create-tables.sql
@@ -61,7 +61,7 @@ CREATE TABLE base.projects (
 	id serial PRIMARY KEY,
 	date_create timestamp without time zone NOT NULL DEFAULT now(),
 	name character varying(100) NOT NULL,
-	bbox character varying(100) NOT NULL,
+	bbox character varying(1000) NOT NULL,
 	nb_plaques_h INT NOT NULL ,
 	nb_plaques_v INT NOT NULL ,
 	ratio INT NOT NULL,
@@ -77,6 +77,11 @@ CREATE TABLE base.projects (
 		ON DELETE NO ACTION,
 	csv_id INTEGER NULL,
 	FOREIGN KEY (csv_id)
+		REFERENCES base.documents (id) MATCH SIMPLE
+		ON UPDATE NO ACTION
+		ON DELETE NO ACTION,
+	emprise_id INTEGER NULL,
+	FOREIGN KEY (emprise_id)
 		REFERENCES base.documents (id) MATCH SIMPLE
 		ON UPDATE NO ACTION
 		ON DELETE NO ACTION