@W-14603959 - backend test failure fixes to save instance object befo…

…re adding more data

docs/api/schema.yml

@@ -1871,6 +1871,11 @@ components:
       - Review
       - Merged
       type: string
+      description: |-
+        * `Planned` - Planned
+        * `In progress` - In Progress
+        * `Review` - Review
+        * `Merged` - Merged
     FullUser:
       type: object
       properties:
@@ -2118,6 +2123,10 @@ components:
       - QA
       - Playground
       type: string
+      description: |-
+        * `Dev` - Dev
+        * `QA` - QA
+        * `Playground` - Playground
     PaginatedEpicList:
       type: object
       properties:
@@ -2481,11 +2490,17 @@ components:
       - Approved
       - Changes requested
       type: string
+      description: |-
+        * `Approved` - Approved
+        * `Changes requested` - Changes Requested
     RoleEnum:
       enum:
       - assigned_qa
       - assigned_dev
       type: string
+      description: |-
+        * `assigned_qa` - assigned_qa
+        * `assigned_dev` - assigned_dev
     ScratchOrg:
       type: object
       properties:
@@ -2909,6 +2924,11 @@ components:
       - Completed
       - Canceled
       type: string
+      description: |-
+        * `Planned` - Planned
+        * `In progress` - In Progress
+        * `Completed` - Completed
+        * `Canceled` - Canceled
   securitySchemes:
     cookieAuth:
       type: apiKey

metecho/api/jobs.py

@@ -400,6 +400,7 @@ def _create_org_and_run_flow(
         originating_user_id=originating_user_id,
         sf_username=scratch_org.owner_sf_username,
     )
+    scratch_org.save()
     scratch_org.refresh_from_db()
     # Save these values on org creation so that we have what we need to
     # delete the org later, even if the initial flow run fails.

metecho/api/models.py

@@ -716,8 +716,9 @@ def __str__(self):
         return self.name
 
     def save(self, *args, **kwargs):
+        obj = super().save(*args, **kwargs)
         self.update_status()
-        return super().save(*args, **kwargs)
+        return obj
 
     def subscribable_by(self, user):  # pragma: nocover
         return True