Merge pull request #238 from dod-ccpo/request-schema-#159719829

Request schema #159719829

atst/models/__init__.py

@@ -14,3 +14,4 @@ from .workspace import Workspace
 from .project import Project
 from .environment import Environment
 from .attachment import Attachment
+from .request_revision import RequestRevision

atst/models/request.py

@@ -1,6 +1,5 @@
 from sqlalchemy import Column, func, ForeignKey
 from sqlalchemy.types import DateTime
-from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.orm import relationship
 import pendulum
 
@@ -8,6 +7,23 @@ from atst.models import Base
 from atst.models.types import Id
 from atst.models.request_status_event import RequestStatus
 from atst.utils import first_or_none
+from atst.models.request_revision import RequestRevision
+
+
+def map_properties_to_dict(properties, instance):
+    return {
+        field: getattr(instance, field)
+        for field in properties
+        if getattr(instance, field) is not None
+    }
+
+
+def update_dict_with_properties(instance, body, top_level_key, properties):
+    new_properties = map_properties_to_dict(properties, instance)
+    if new_properties:
+        body[top_level_key] = new_properties
+
+    return body
 
 
 class Request(Base):
@@ -15,7 +31,6 @@ class Request(Base):
 
     id = Id()
     time_created = Column(DateTime(timezone=True), server_default=func.now())
-    body = Column(JSONB)
     status_events = relationship(
         "RequestStatusEvent", backref="request", order_by="RequestStatusEvent.sequence"
     )
@@ -28,6 +43,78 @@ class Request(Base):
     task_order_id = Column(ForeignKey("task_order.id"))
     task_order = relationship("TaskOrder")
 
+    revisions = relationship(
+        "RequestRevision", back_populates="request", order_by="RequestRevision.sequence"
+    )
+
+    @property
+    def latest_revision(self):
+        if self.revisions:
+            return self.revisions[-1]
+
+        else:
+            return RequestRevision(request=self)
+
+    PRIMARY_POC_FIELDS = ["am_poc", "dodid_poc", "email_poc", "fname_poc", "lname_poc"]
+    DETAILS_OF_USE_FIELDS = [
+        "jedi_usage",
+        "start_date",
+        "cloud_native",
+        "dollar_value",
+        "dod_component",
+        "data_transfers",
+        "expected_completion_date",
+        "jedi_migration",
+        "num_software_systems",
+        "number_user_sessions",
+        "average_daily_traffic",
+        "engineering_assessment",
+        "technical_support_team",
+        "estimated_monthly_spend",
+        "average_daily_traffic_gb",
+        "rationalization_software_systems",
+        "organization_providing_assistance",
+    ]
+    INFORMATION_ABOUT_YOU_FIELDS = [
+        "citizenship",
+        "designation",
+        "phone_number",
+        "email_request",
+        "fname_request",
+        "lname_request",
+        "service_branch",
+        "date_latest_training",
+    ]
+    FINANCIAL_VERIFICATION_FIELDS = [
+        "pe_id",
+        "task_order_number",
+        "fname_co",
+        "lname_co",
+        "email_co",
+        "office_co",
+        "fname_cor",
+        "lname_cor",
+        "email_cor",
+        "office_cor",
+        "uii_ids",
+        "treasury_code",
+        "ba_code",
+    ]
+
+    @property
+    def body(self):
+        current = self.latest_revision
+        body = {}
+        for top_level_key, properties in [
+            ("primary_poc", Request.PRIMARY_POC_FIELDS),
+            ("details_of_use", Request.DETAILS_OF_USE_FIELDS),
+            ("information_about_you", Request.INFORMATION_ABOUT_YOU_FIELDS),
+            ("financial_verification", Request.FINANCIAL_VERIFICATION_FIELDS),
+        ]:
+            body = update_dict_with_properties(current, body, top_level_key, properties)
+
+        return body
+
     @property
     def status(self):
         return self.status_events[-1].new_status
@@ -38,7 +125,7 @@ class Request(Base):
 
     @property
     def annual_spend(self):
-        monthly = self.body.get("details_of_use", {}).get("estimated_monthly_spend", 0)
+        monthly = self.latest_revision.estimated_monthly_spend or 0
         return monthly * 12
 
     @property

atst/models/request_revision.py

@@ -0,0 +1,78 @@
+from sqlalchemy import (
+    Column,
+    ForeignKey,
+    String,
+    Boolean,
+    Integer,
+    Date,
+    BigInteger,
+    Sequence,
+)
+from sqlalchemy.orm import relationship
+from sqlalchemy.dialects.postgresql import ARRAY
+
+from atst.models import Base
+from atst.models.mixins import TimestampsMixin
+from atst.models.types import Id
+
+
+class RequestRevision(Base, TimestampsMixin):
+    __tablename__ = "request_revisions"
+
+    id = Id()
+    request_id = Column(ForeignKey("requests.id"), nullable=False)
+    request = relationship("Request", back_populates="revisions")
+    sequence = Column(
+        BigInteger, Sequence("request_revisions_sequence_seq"), nullable=False
+    )
+
+    # primary_poc
+    am_poc = Column(Boolean, default=False)
+    dodid_poc = Column(String)
+    email_poc = Column(String)
+    fname_poc = Column(String)
+    lname_poc = Column(String)
+
+    # details_of_use
+    jedi_usage = Column(String)
+    start_date = Column(Date())
+    cloud_native = Column(String)
+    dollar_value = Column(Integer)
+    dod_component = Column(String)
+    data_transfers = Column(String)
+    expected_completion_date = Column(String)
+    jedi_migration = Column(String)
+    num_software_systems = Column(Integer)
+    number_user_sessions = Column(Integer)
+    average_daily_traffic = Column(Integer)
+    engineering_assessment = Column(String)
+    technical_support_team = Column(String)
+    estimated_monthly_spend = Column(Integer)
+    average_daily_traffic_gb = Column(Integer)
+    rationalization_software_systems = Column(String)
+    organization_providing_assistance = Column(String)
+
+    # information_about_you
+    citizenship = Column(String)
+    designation = Column(String)
+    phone_number = Column(String)
+    email_request = Column(String)
+    fname_request = Column(String)
+    lname_request = Column(String)
+    service_branch = Column(String)
+    date_latest_training = Column(Date())
+
+    # financial_verification
+    pe_id = Column(String)
+    task_order_number = Column(String)
+    fname_co = Column(String)
+    lname_co = Column(String)
+    email_co = Column(String)
+    office_co = Column(String)
+    fname_cor = Column(String)
+    lname_cor = Column(String)
+    email_cor = Column(String)
+    office_cor = Column(String)
+    uii_ids = Column(ARRAY(String))
+    treasury_code = Column(String)
+    ba_code = Column(String)

atst/models/request_status_event.py

@@ -1,5 +1,6 @@
 from enum import Enum
 from sqlalchemy import Column, func, ForeignKey, Enum as SQLAEnum
+from sqlalchemy.orm import relationship
 from sqlalchemy.types import DateTime, BigInteger
 from sqlalchemy.schema import Sequence
 from sqlalchemy.dialects.postgresql import UUID
@@ -31,6 +32,8 @@ class RequestStatusEvent(Base):
     sequence = Column(
         BigInteger, Sequence("request_status_events_sequence_seq"), nullable=False
     )
+    request_revision_id = Column(ForeignKey("request_revisions.id"), nullable=False)
+    revision = relationship("RequestRevision")
 
     @property
     def displayname(self):