Merge pull request #2 from Kevinwochan/fix/updated-events

Kevinwochan · web-flow · commit 4b081634316a · 2024-03-05T01:43:23.000+11:00
Fix/updated events
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/contract_status_changed_event_contract_1_approved.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/contract_status_changed_event_contract_1_approved.json
@@ -2,7 +2,7 @@
   {
     "DetailType": "ContractStatusChanged",
     "Source": "unicorn.contracts",
-    "EventBusName": "UnicornPropertiesEventBus-Local",
+    "EventBusName": "UnicornPropertiesBus-local",
     "Detail": "{ \"ContractUpdatedOn\": \"10/08/2022 19:56:30\", \"ContractId\": \"f2bedc80-3dc8-4544-9140-9b606d71a6ee\", \"PropertyId\": \"usa/anytown/main-street/111\", \"ContractStatus\": \"APPROVED\" }"
   }
 ]
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/contract_status_changed_event_contract_1_draft.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/contract_status_changed_event_contract_1_draft.json
@@ -2,7 +2,7 @@
   {
     "DetailType": "ContractStatusChanged",
     "Source": "unicorn.contracts",
-    "EventBusName": "UnicornPropertiesEventBus-Local",
+    "EventBusName": "UnicornPropertiesBus-local",
     "Detail": "{ \"ContractUpdatedOn\": \"10/08/2022 19:56:30\", \"ContractId\": \"f2bedc80-3dc8-4544-9140-9b606d71a6ee\", \"PropertyId\": \"usa/anytown/main-street/111\", \"ContractStatus\": \"DRAFT\" }"
   }
 ]
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/contract_status_changed_event_contract_2_approved.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/contract_status_changed_event_contract_2_approved.json
@@ -2,7 +2,7 @@
   {
     "DetailType": "ContractStatusChanged",
     "Source": "unicorn.contracts",
-    "EventBusName": "UnicornPropertiesEventBus-Local",
+    "EventBusName": "UnicornPropertiesBus-local",
     "Detail": "{ \"ContractUpdatedOn\": \"10/08/2022 19:56:30\", \"ContractId\": \"9183453b-d284-4466-a2d9-f00b1d569ad7\", \"PropertyId\": \"usa/anytown/main-street/222\", \"ContractStatus\": \"APPROVED\" }"
   }
 ]
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/contract_status_changed_event_contract_2_draft.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/contract_status_changed_event_contract_2_draft.json
@@ -2,7 +2,7 @@
   {
     "DetailType": "ContractStatusChanged",
     "Source": "unicorn.contracts",
-    "EventBusName": "UnicornPropertiesEventBus-Local",
+    "EventBusName": "UnicornPropertiesBus-local",
     "Detail": "{ \"ContractUpdatedOn\": \"10/08/2022 19:56:30\", \"ContractId\": \"9183453b-d284-4466-a2d9-f00b1d569ad7\", \"PropertyId\": \"usa/anytown/main-street/222\", \"ContractStatus\": \"DRAFT\" }"
   }
 ]
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publicaction_approval_requested_event_all_good.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publicaction_approval_requested_event_all_good.json
@@ -0,0 +1,8 @@
+[
+  {
+    "DetailType": "PublicationApprovalRequested",
+    "Source": "unicorn.web",
+    "EventBusName": "UnicornPropertiesBus-local",
+    "Detail": "{\"PropertyId\":\"usa/anytown/main-street/222\",\"Address\":{\"Country\":\"USA\",\"City\":\"Anytown\",\"Street\":\"Main Street\",\"Number\":222},\"Description\":\"This classic Anytown estate comes with a covetable lake view. The romantic and comfortable backyard is the perfect setting for unicorn get-togethers. The open concept Main Stable is fully equipped with all the desired amenities. Second floor features 6 straw bales including large Rainbow Suite with private training pool terrace and Jr Sparkles Suite.\",\"Contract\":\"sale\",\"ListPrice\":200,\"Currency\":\"SPL\",\"images\":[\"prop1_exterior1.jpg\",\"prop1_interior1.jpg\",\"prop1_interior2.jpg\",\"prop1_interior3.jpg\"]}"
+  }
+]
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publicaction_approval_requested_event_inappropriate_description.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publicaction_approval_requested_event_inappropriate_description.json
@@ -0,0 +1,8 @@
+[
+  {
+    "DetailType": "PublicationApprovalRequested",
+    "Source": "unicorn.web",
+    "EventBusName": "UnicornPropertiesBus-local",
+    "Detail": "{\"PropertyId\":\"usa/anytown/main-street/111\",\"Address\":{\"Country\":\"USA\",\"City\":\"Anytown\",\"Street\":\"Main Street\",\"Number\":111},\"Description\":\"This is a property for goblins. The property has the worst quality and is atrocious when it comes to design. The property is not clean whatsoever, and will make any property owner have buyers' remorse as soon the property is bought. Keep away from this property as much as possible!\",\"Contract\":\"sale\",\"ListPrice\":200,\"Currency\":\"SPL\",\"images\":[\"prop1_exterior1.jpg\",\"prop1_interior1.jpg\",\"prop1_interior2.jpg\",\"prop1_interior3.jpg\"]}"
+  }
+]
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publicaction_approval_requested_event_inappropriate_images.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publicaction_approval_requested_event_inappropriate_images.json
@@ -0,0 +1,8 @@
+[
+  {
+    "DetailType": "PublicationApprovalRequested",
+    "Source": "unicorn.web",
+    "EventBusName": "UnicornPropertiesBus-local",
+    "Detail": "{\"PropertyId\":\"usa/anytown/main-street/111\",\"Address\":{\"Country\":\"USA\",\"City\":\"Anytown\",\"Street\":\"Main Street\",\"Number\":111},\"Description\":\"This classic Anytown estate comes with a covetable lake view. The romantic and comfortable backyard is the perfect setting for unicorn get-togethers. The open concept Main Stable is fully equipped with all the desired amenities. Second floor features 6 straw bales including large Rainbow Suite with private training pool terrace and Jr Sparkles Suite.\",\"Contract\":\"sale\",\"ListPrice\":200,\"Currency\":\"SPL\",\"images\":[\"prop1_exterior1.jpg\",\"prop1_interior1.jpg\",\"prop1_interior2.jpg\",\"prop1_interior3.jpg\",\"prop1_interior4-bad.jpg\"]}"
+  }
+]
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publicaction_approval_requested_event_non_existing_contract.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publicaction_approval_requested_event_non_existing_contract.json
@@ -0,0 +1,8 @@
+[
+  {
+    "DetailType": "PublicationApprovalRequested",
+    "Source": "unicorn.web",
+    "EventBusName": "UnicornPropertiesBus-local",
+    "Detail": "{\"PropertyId\":\"usa/anytown/main-street/333\",\"Address\":{\"Country\":\"USA\",\"City\":\"Anytown\",\"Street\":\"Main Street\",\"Number\":333},\"Description\":\"This classic Anytown estate comes with a covetable lake view. The romantic and comfortable backyard is the perfect setting for unicorn get-togethers. The open concept Main Stable is fully equipped with all the desired amenities. Second floor features 6 straw bales including large Rainbow Suite with private training pool terrace and Jr Sparkles Suite.\",\"Contract\":\"sale\",\"ListPrice\":200,\"Currency\":\"SPL\",\"images\":[\"prop1_exterior1.jpg\",\"prop1_interior1.jpg\",\"prop1_interior2.jpg\",\"prop1_interior3.jpg\"]}"
+  }
+]
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publicaction_approval_requested_event_pause_workflow.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publicaction_approval_requested_event_pause_workflow.json
@@ -0,0 +1,8 @@
+[
+  {
+    "DetailType": "PublicationApprovalRequested",
+    "Source": "unicorn.web",
+    "EventBusName": "UnicornPropertiesBus-local",
+    "Detail": "{\"PropertyId\":\"usa/anytown/main-street/111\",\"Address\":{\"Country\":\"USA\",\"City\":\"Anytown\",\"Street\":\"Main Street\",\"Number\":111},\"Description\":\"This classic Anytown estate comes with a covetable lake view. The romantic and comfortable backyard is the perfect setting for unicorn get-togethers. The open concept Main Stable is fully equipped with all the desired amenities. Second floor features 6 straw bales including large Rainbow Suite with private training pool terrace and Jr Sparkles Suite.\",\"Contract\":\"sale\",\"ListPrice\":200,\"Currency\":\"SPL\",\"images\":[\"prop1_exterior1.jpg\",\"prop1_interior1.jpg\",\"prop1_interior2.jpg\",\"prop1_interior3.jpg\"]}"
+  }
+]
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publication_approval_requested_event.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publication_approval_requested_event.json
@@ -2,8 +2,8 @@
   "version": "0",
   "id": "f849f683-76e1-1c84-669d-544a9828dfef",
   "detail-type": "PublicationApprovalRequested",
-  "source": "unicorn.properties.web",
-  "account": "111111111111",
+  "source": "unicorn.web",
+  "account": "123456789012",
   "time": "2022-08-16T06:33:05Z",
   "region": "ap-southeast-2",
   "resources": [],
@@ -27,4 +27,4 @@
       "prop1_interior4-bad.jpg"
     ]
   }
-}
+}
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publication_evaluation_completed_event.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/publication_evaluation_completed_event.json
@@ -12,4 +12,4 @@
     "evaluation_result": "APPROVED|DECLINED",
     "result_reason": "UNSAFE_IMAGE_DETECTED|BAD_SENTIMENT_DETECTED|..."
   }
-}
+}
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/put_event_property_approval_requested.json b/Unicorn.Properties/PropertiesService.Tests/events/EventBridge/put_event_property_approval_requested.json
@@ -1,8 +1,8 @@
 [
-    {
-      "Source": "unicorn.properties.web",
-      "Detail": "{ \"property_id\": \"usa/anytown/main-street/123\", \"country\": \"USA\", \"city\": \"Anytown\", \"street\": \"Main Street\", \"number\": 123, \"description\": \"This classic Anytown estate comes with a covetable lake view. The romantic and comfortable backyard is the perfect setting for unicorn get-togethers. The open concept Main Stable is fully equipped with all the desired amenities. Second floor features 6 straw bales including large Rainbow Suite with private training pool terrace and Jr Sparkles Suite.\", \"contract\": \"sale\", \"listprice\": 200, \"currency\": \"SPL\", \"images\": [ \"prop1_exterior1.jpg\", \"prop1_interior1.jpg\", \"prop1_interior2.jpg\", \"prop1_interior3.jpg\", \"prop1_interior4-bad.jpg\" ] }",
-      "DetailType": "PublicationApprovalRequested",
-      "EventBusName": "UnicornPropertiesEventBus-Local"
-    }
-  ]
+  {
+    "Source": "unicorn.web",
+    "Detail": "{ \"PropertyId\": \"usa/anytown/main-street/123\", \"Country\": \"USA\", \"City\": \"Anytown\", \"Street\": \"Main Street\", \"Number\": 123, \"Description\": \"This classic Anytown estate comes with a covetable lake view. The romantic and comfortable backyard is the perfect setting for unicorn get-togethers. The open concept Main Stable is fully equipped with all the desired amenities. Second floor features 6 straw bales including large Rainbow Suite with private training pool terrace and Jr Sparkles Suite.\", \"Contract\": \"sale\", \"ListPrice\": 200, \"Currency\": \"SPL\", \"images\": [ \"prop1_exterior1.jpg\", \"prop1_interior1.jpg\", \"prop1_interior2.jpg\", \"prop1_interior3.jpg\", \"prop1_interior4-bad.jpg\" ] }",
+    "DetailType": "PublicationApprovalRequested",
+    "EventBusName": "UnicornPropertiesBus-local"
+  }
+]
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/put_event_contract_status_changed.json b/Unicorn.Properties/PropertiesService.Tests/events/put_event_contract_status_changed.json
@@ -1,7 +1,7 @@
 [
   {
     "Source": "unicorn.contracts",
-    "Detail": "{\"contract_updated_on\":\"10/08/2022 20:36:30\",\"contract_id\": \"199\",\"property_id\":\"bbb\",\"contract_status\":\"APPROVED\"}",
+    "Detail": "{\"ContractUpdatedOn\":\"10/08/2022 20:36:30\",\"ContractId\": \"199\",\"PropertyId\":\"bbb\",\"ContractStatus\":\"APPROVED\"}",
     "DetailType": "ContractStatusChanged",
     "EventBusName": "Dev-UnicornPropertiesEventBus"
   }
diff --git a/Unicorn.Properties/PropertiesService.Tests/events/send_events_cli.json b/Unicorn.Properties/PropertiesService.Tests/events/send_events_cli.json
@@ -1,8 +1,8 @@
 [
     {
-        "EventBusName": "Dev-UnicornPropertiesEventBus",
-        "Source": "unicorn.properties.web",
+        "EventBusName": "UnicornPropertiesBus",
+        "Source": "unicorn.web",
         "DetailType": "PublicationApprovalRequested",
-        "Detail": "{\"property_id\": \"usa/anytown/main-street/123\",\"country\": \"USA\",\"city\": \"Anytown\",\"street\": \"Main Street\",\"number\": 123,\"description\": \"This classic Anytown estate comes with a covetable lake view. The romantic and comfortable backyard is the perfect setting for unicorn get-togethers. The open concept Main Stable is fully equipped with all the desired amenities. Second floor features 6 straw bales including large Rainbow Suite with private training pool terrace and Jr Sparkles Suite.\",\"contract\": \"sale\",\"listprice\": 200,\"currency\": \"SPL\",\"images\": [    \"usa/anytown/main-street-123-0d61b4e3\"]}"
+        "Detail": "{\"PropertyId\": \"usa/anytown/main-street/123\",\"Country\": \"USA\",\"City\": \"Anytown\",\"Street\": \"Main Street\",\"Number\": 123,\"Description\": \"This classic Anytown estate comes with a covetable lake view. The romantic and comfortable backyard is the perfect setting for unicorn get-togethers. The open concept Main Stable is fully equipped with all the desired amenities. Second floor features 6 straw bales including large Rainbow Suite with private training pool terrace and Jr Sparkles Suite.\",\"Contract\": \"sale\",\"ListPrice\": 200,\"Currency\": \"SPL\",\"images\": [    \"usa/anytown/main-street-123-0d61b4e3\"]}"
     }
 ]
diff --git a/Unicorn.Properties/StateMachine/PropertyApproval.asl.yaml b/Unicorn.Properties/StateMachine/PropertyApproval.asl.yaml
@@ -22,7 +22,7 @@ States:
     Comment: >-
       ContractExistsChecker checks to see if a contract for a specified
       property exists.
-  
+
   NotFound:
     Type: Fail
 
@@ -46,9 +46,9 @@ States:
     Comment: >-
       Loop through all the images for the property and ensure they don't have
       unsafe content.
-    ItemsPath: "$.detail.Images"
+    ItemsPath: "$.detail.images"
     ResultPath: "$.ImageModerations"
-  
+
   CheckDescriptionSentiment:
     Type: Task
     Parameters:
@@ -62,7 +62,7 @@ States:
     Type: Task
     Resource: arn:aws:states:::lambda:invoke
     ResultPath: "$.ValidationCheck"
-    ResultSelector :
+    ResultSelector:
       ValidationResult.$: "$.Payload.ValidationResult"
     Parameters:
       Payload.$: $
@@ -80,9 +80,9 @@ States:
   IsContentSafe:
     Type: Choice
     Choices:
-    - Variable: $.ValidationCheck.ValidationResult
-      StringEquals: PASS
-      Next: WaitForContractApproval
+      - Variable: $.ValidationCheck.ValidationResult
+        StringEquals: PASS
+        Next: WaitForContractApproval
     Default: PublicationEvaluationCompletedDeclined
 
   PublicationEvaluationCompletedDeclined:
@@ -99,7 +99,7 @@ States:
     Next: Declined
   Declined:
     Type: Succeed
-  
+
   WaitForContractApproval:
     Type: Task
     Resource: arn:aws:states:::lambda:invoke.waitForTaskToken

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`"DetailType": "ContractStatusChanged",`
`4`	`4`	`"Source": "unicorn.contracts",`
`5`		`- "EventBusName": "UnicornPropertiesEventBus-Local",`
	`5`	`+ "EventBusName": "UnicornPropertiesBus-local",`
`6`	`6`	`"Detail": "{ \"ContractUpdatedOn\": \"10/08/2022 19:56:30\", \"ContractId\": \"f2bedc80-3dc8-4544-9140-9b606d71a6ee\", \"PropertyId\": \"usa/anytown/main-street/111\", \"ContractStatus\": \"APPROVED\" }"`
`7`	`7`	`}`
`8`	`8`	`]`