update to use request revisions

atst/models/request.py

@@ -7,7 +7,23 @@ import pendulum
 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.utils import deep_merge, first_or_none
+
+
+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):
@@ -28,7 +44,77 @@ class Request(Base):
     task_order_id = Column(ForeignKey("task_order.id"))
     task_order = relationship("TaskOrder")
 
-    revisions = relationship("RequestRevision", back_populates="request")
+    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):
@@ -40,7 +126,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

@@ -1,5 +1,15 @@
 import pendulum
-from sqlalchemy import Column, func, ForeignKey, String, Boolean, Integer, Date
+from sqlalchemy import (
+    Column,
+    func,
+    ForeignKey,
+    String,
+    Boolean,
+    Integer,
+    Date,
+    BigInteger,
+    Sequence,
+)
 from sqlalchemy.types import DateTime
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.orm import relationship
@@ -15,6 +25,9 @@ class RequestRevision(Base, TimestampsMixin):
     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)
@@ -26,20 +39,20 @@ class RequestRevision(Base, TimestampsMixin):
     # details_of_use
     jedi_usage = Column(String)
     start_date = Column(Date())
-    cloud_native = Column(Boolean)
+    cloud_native = Column(String)
     dollar_value = Column(Integer)
     dod_component = Column(String)
     data_transfers = Column(String)
     expected_completion_date = Column(String)
-    jedi_migration = Column(Boolean)
+    jedi_migration = Column(String)
     num_software_systems = Column(Integer)
     number_user_sessions = Column(Integer)
     average_daily_traffic = Column(Integer)
-    engineering_assessment = Column(Boolean)
-    technical_support_team = Column(Boolean)
+    engineering_assessment = Column(String)
+    technical_support_team = Column(String)
     estimated_monthly_spend = Column(Integer)
     average_daily_traffic_gb = Column(Integer)
-    rationalization_software_systems = Column(Boolean)
+    rationalization_software_systems = Column(String)
     organization_providing_assistance = Column(String)
 
     # information_about_you
@@ -66,13 +79,3 @@ class RequestRevision(Base, TimestampsMixin):
     uii_ids = Column(String)
     treasury_code = Column(String)
     ba_code = Column(String)
-
-    _BOOLS = ["am_poc", "jedi_migration", "engineering_assessment", "technical_support_team", "rationalization_software_systems", "cloud_native"]
-    _TIMESTAMPS = ["start_date", "date_latest_training"]
-
-    @classmethod
-    def create_from_request_body(cls, request, **body):
-        coerced_bools = {k: v == "yes" for k,v in body.items() if k in RequestRevision._BOOLS}
-        coerced_timestamps = {k: pendulum.parse(v) for k,v in body.items() if k in RequestRevision._TIMESTAMPS}
-        body = {**body, **coerced_bools, **coerced_timestamps}
-        return RequestRevision(request=request, **body)