Merge pull request #442 from dod-ccpo/more-finver

More tweaks to financial verification draft feature

atst/forms/financial.py

@@ -31,24 +31,7 @@ def coerce_choice(val):
         return val.value
 
 
-class DraftValidateMixin(object):
-    def validate_draft(self):
-        """
-        Make all fields optional before validation, and then return them to
-        their previous state.
-        """
-        for field in self:
-            field.validators.insert(0, Optional())
-
-        valid = self.validate()
-
-        for field in self:
-            field.validators.pop(0)
-
-        return valid
-
-
-class TaskOrderForm(ValidatedForm, DraftValidateMixin):
+class TaskOrderForm(ValidatedForm):
     def do_validate_number(self):
         for field in self:
             if field.name != "task_order-number":
@@ -144,7 +127,7 @@ class TaskOrderForm(ValidatedForm, DraftValidateMixin):
     )
 
 
-class RequestFinancialVerificationForm(ValidatedForm, DraftValidateMixin):
+class RequestFinancialVerificationForm(ValidatedForm):
     uii_ids = NewlineListField(
         "Unique Item Identifier (UII)s related to your application(s) if you already have them.",
         description="If you have more than one UII, place each one on a new line.",
@@ -224,9 +207,6 @@ class FinancialVerificationForm(ValidatedForm):
         task_order_valid = self.task_order.do_validate_number()
         return request_valid and task_order_valid
 
-    def validate_draft(self):
-        return self.task_order.validate_draft() and self.request.validate_draft()
-
     def reset(self):
         self.request.reset()
 

atst/models/request.py

@@ -238,6 +238,13 @@ class Request(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
             else None
         )
 
+    @property
+    def last_finver_draft_saved_at(self):
+        if self.latest_revision.any_finver_fields_saved:
+            return self.latest_revision.time_updated
+        else:
+            return None
+
     def __repr__(self):
         return "<Request(status='{}', name='{}', creator='{}', is_approved='{}', time_created='{}', id='{}')>".format(
             self.status_displayname,

atst/models/request_revision.py

@@ -83,3 +83,24 @@ class RequestRevision(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
         return "<RequestRevision(request='{}', id='{}')>".format(
             self.request_id, self.id
         )
+
+    @property
+    def any_finver_fields_saved(self):
+        return any(
+            getattr(self, n, None)
+            for n in [
+                "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",
+            ]
+        )

atst/routes/requests/financial_verification.py

@@ -169,35 +169,20 @@ class SaveFinancialVerificationDraft(FinancialVerificationBase):
 
     def execute(self):
         form = self._get_form(self.request, self.is_extended, self.fv_data)
-        valid = True
-
-        if not form.validate_draft():
-            self._raise(form)
-
-        if form.pe_id.data and not self.pe_validator.validate(self.request, form.pe_id):
-            valid = False
-
-        if form.task_order.number.data and not self.task_order_validator.validate(
-            form.task_order.number
-        ):
-            valid = False
-
         attachment = self._process_attachment(self.is_extended, form)
         task_order = self._try_create_task_order(form, attachment, self.is_extended)
         updated_request = Requests.update_financial_verification(
             self.request.id, form.request.data, task_order=task_order
         )
 
-        if valid:
-            return updated_request
-        else:
-            self._raise(form)
+        return updated_request
 
 
 @requests_bp.route("/requests/verify/<string:request_id>", methods=["GET"])
 def financial_verification(request_id):
     request = Requests.get(g.current_user, request_id)
     is_extended = fv_extended(http_request)
+    saved_draft = http_request.args.get("saved_draft", False)
 
     should_be_extended = not is_extended and request.has_manual_task_order
     if should_be_extended:
@@ -215,6 +200,7 @@ def financial_verification(request_id):
         jedi_request=request,
         review_comment=request.review_comment,
         extended=is_extended,
+        saved_draft=saved_draft,
     )
 
 
@@ -254,15 +240,16 @@ def update_financial_verification(request_id):
 
 @requests_bp.route("/requests/verify/<string:request_id>/draft", methods=["POST"])
 def save_financial_verification_draft(request_id):
-    request = Requests.get(g.current_user, request_id)
+    user = g.current_user
+    request = Requests.get(user, request_id)
     fv_data = {**http_request.form, **http_request.files}
     is_extended = fv_extended(http_request)
 
     try:
-        SaveFinancialVerificationDraft(
+        updated_request = SaveFinancialVerificationDraft(
             PENumberValidator(),
             TaskOrderNumberValidator(),
-            g.current_user,
+            user,
             request,
             fv_data,
             is_extended=is_extended,
@@ -275,4 +262,11 @@ def save_financial_verification_draft(request_id):
             extended=is_extended,
         )
 
-    return redirect(url_for("requests.requests_index"))
+    return redirect(
+        url_for(
+            "requests.financial_verification",
+            request_id=updated_request.id,
+            is_extended=is_extended,
+            saved_draft=True,
+        )
+    )