Merge pull request #51 from chicagopcdc/pcdc_dev

Pcdc dev
chicagopcdc · Feb 13, 2024 · 845f09d · 845f09d
2 parents 58d47c6 + 19c2c65
commit 845f09d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/userportaldatamodel/schemas/project_schema.py b/userportaldatamodel/schemas/project_schema.py
@@ -6,7 +6,7 @@
 
 class ProjectSchema(SQLAlchemyAutoSchema):
     searches = Nested('SearchSchema', many=True)
-    requests = Nested('RequestSchema', many=True)
+    requests = Nested('RequestSchema', many=True, exclude=["project"])
     statisticians = Nested('StatisticianSchema', many=True)
     associated_users = Nested('AssociatedUserSchema', many=True)
     associated_users_roles = Nested("ProjectAssociatedUserSchema", many=True)

diff --git a/userportaldatamodel/schemas/request_has_state_schema.py b/userportaldatamodel/schemas/request_has_state_schema.py
@@ -4,9 +4,9 @@
 
 
 class RequestStateSchema(SQLAlchemyAutoSchema):
-
+    state = Nested("StateSchema")
+    request = Nested("RequestSchema")
     class Meta:
         model = RequestState
         include_fk = True
-        state = Nested("StateSchema")
-        request = Nested("RequestSchema")
+
diff --git a/userportaldatamodel/schemas/request_schema.py b/userportaldatamodel/schemas/request_schema.py
@@ -10,7 +10,8 @@ class RequestSchema(SQLAlchemyAutoSchema):
     states = Nested('StateSchema', many=True)
     project = Nested('ProjectSchema', exclude=["requests",])
     consortium_data_contributor = Nested('ConsortiumDataContributorSchema', exclude=["requests",])
-
+    request_has_state = Nested('RequestStateSchema', many=True, exclude=['request'])
+
     class Meta:
         model = Request
         include_fk = True