fix: fixes bugs in implementation, tests and sample events

adrianjhunter · adrianjhunter · commit 7d1da18d412d · 2025-05-26T13:47:56.000+10:00
diff --git a/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/contract_status_changed_event_contract_1_approved.json b/unicorn_properties/PropertyFunctions/src/test/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": "{ \"contract_last_modified_on\": 1669385541019, \"contract_id\": \"f2bedc80-3dc8-4544-9140-9b606d71a6ee\", \"property_id\": \"usa/anytown/main-street/111\", \"contract_status\": \"APPROVED\" }"
   }
 ]
diff --git a/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/contract_status_changed_event_contract_1_draft.json b/unicorn_properties/PropertyFunctions/src/test/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": "{ \"contract_last_modified_on\": 1669385541019, \"contract_id\": \"f2bedc80-3dc8-4544-9140-9b606d71a6ee\", \"property_id\": \"usa/anytown/main-street/111\", \"contract_status\": \"DRAFT\" }"
   }
 ]
diff --git a/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/contract_status_changed_event_contract_2_approved.json b/unicorn_properties/PropertyFunctions/src/test/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": "{ \"contract_last_modified_on\": 1669385541019, \"contract_id\": \"9183453b-d284-4466-a2d9-f00b1d569ad7\", \"property_id\": \"usa/anytown/main-street/222\", \"contract_status\": \"APPROVED\" }"
   }
 ]
diff --git a/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/contract_status_changed_event_contract_2_draft.json b/unicorn_properties/PropertyFunctions/src/test/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": "{ \"contract_last_modified_on\": 1669385541019, \"contract_id\": \"9183453b-d284-4466-a2d9-f00b1d569ad7\", \"property_id\": \"usa/anytown/main-street/222\", \"contract_status\": \"DRAFT\" }"
   }
 ]
diff --git a/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event.json b/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event.json
@@ -2,7 +2,7 @@
   "version": "0",
   "id": "f849f683-76e1-1c84-669d-544a9828dfef",
   "detail-type": "PublicationApprovalRequested",
-  "source": "unicorn.properties.web",
+  "source": "unicorn.web",
   "account": "123456789",
   "time": "2022-08-16T06:33:05Z",
   "region": "ap-southeast-2",
diff --git a/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event_all_good.json b/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event_all_good.json
@@ -1,8 +1,8 @@
 [
     {
       "DetailType": "PublicationApprovalRequested",
-      "Source": "unicorn.properties.web",
-      "EventBusName": "UnicornPropertiesEventBus-Local",
+      "Source": "unicorn.web",
+      "EventBusName": "UnicornPropertiesBus-local",
       "Detail": "{\"property_id\":\"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\":[\"property_images/prop1_exterior1.jpg\",\"property_images/prop1_interior1.jpg\",\"property_images/prop1_interior2.jpg\",\"property_images/prop1_interior3.jpg\"]}"
     }
 ]
diff --git a/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event_inappropriate_description.json b/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event_inappropriate_description.json
@@ -1,8 +1,8 @@
 [
     {
       "DetailType": "PublicationApprovalRequested",
-      "Source": "unicorn.properties.web",
-      "EventBusName": "UnicornPropertiesEventBus-Local",
+      "Source": "unicorn.web",
+      "EventBusName": "UnicornPropertiesBus-local",
       "Detail": "{\"property_id\":\"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\":[\"property_images/prop1_exterior1.jpg\",\"property_images/prop1_interior1.jpg\",\"property_images/prop1_interior2.jpg\",\"property_images/prop1_interior3.jpg\"]}"
     }
 ]
diff --git a/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event_inappropriate_images.json b/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event_inappropriate_images.json
@@ -1,8 +1,8 @@
 [
     {
       "DetailType": "PublicationApprovalRequested",
-      "Source": "unicorn.properties.web",
-      "EventBusName": "UnicornPropertiesEventBus-Local",
+      "Source": "unicorn.web",
+      "EventBusName": "UnicornPropertiesBus-local",
       "Detail": "{\"property_id\":\"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\":[\"property_images/prop1_exterior1.jpg\",\"property_images/prop1_interior1.jpg\",\"property_images/prop1_interior2.jpg\",\"property_images/prop1_interior3.jpg\",\"property_images/prop1_interior4-bad.jpg\"]}"
     }
 ]
diff --git a/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event_non_existing_contract.json b/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event_non_existing_contract.json
@@ -1,8 +1,8 @@
 [
     {
       "DetailType": "PublicationApprovalRequested",
-      "Source": "unicorn.properties.web",
-      "EventBusName": "UnicornPropertiesEventBus-Local",
+      "Source": "unicorn.web",
+      "EventBusName": "UnicornPropertiesBus-local",
       "Detail": "{\"property_id\":\"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\":[\"property_images/prop1_exterior1.jpg\",\"property_images/prop1_interior1.jpg\",\"property_images/prop1_interior2.jpg\",\"property_images/prop1_interior3.jpg\"]}"
     }
 ]
diff --git a/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event_pause_workflow.json b/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/publication_approval_requested_event_pause_workflow.json
@@ -1,8 +1,8 @@
 [
     {
       "DetailType": "PublicationApprovalRequested",
-      "Source": "unicorn.properties.web",
-      "EventBusName": "UnicornPropertiesEventBus-Local",
+      "Source": "unicorn.web",
+      "EventBusName": "UnicornPropertiesBus-local",
       "Detail": "{\"property_id\":\"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\":[\"property_images/prop1_exterior1.jpg\",\"property_images/prop1_interior1.jpg\",\"property_images/prop1_interior2.jpg\",\"property_images/prop1_interior3.jpg\"]}"
     }
 ]
diff --git a/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/put_event_property_approval_requested.json b/unicorn_properties/PropertyFunctions/src/test/events/eventbridge/put_event_property_approval_requested.json
@@ -1,8 +1,8 @@
 [
     {
-      "Source": "unicorn.properties.web",
+      "Source": "unicorn.web",
       "Detail": "{ \"property_id\": \"usa/anytown/main-street/111\", \"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\" ] }",
       "DetailType": "PublicationApprovalRequested",
-      "EventBusName": "Local-UnicornPropertiesEventBus"
+      "EventBusName": "UnicornPropertiesBus-local"
     }
   ]
diff --git a/unicorn_properties/template.yaml b/unicorn_properties/template.yaml
@@ -89,7 +89,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       CodeUri: ./PropertyFunctions
-      Handler: Unicorn.Properties.PropertiesService::Unicorn.Properties.PropertiesService.ContractStatusChangedEventHandler::FunctionHandler
+      Handler: properties.ContractStatusChangedHandlerFunction::handleRequest
       Policies:
         - DynamoDBWritePolicy:
             TableName: !Ref ContractStatusTable
@@ -131,7 +131,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       CodeUri: ./PropertyFunctions
-      Handler: Unicorn.Properties.PropertiesService::Unicorn.Properties.PropertiesService.PropertiesApprovalSyncFunction::FunctionHandler
+      Handler: properties.PropertiesApprovalSyncFunction::handleRequest
       Policies:
         - DynamoDBReadPolicy:
             TableName: !Ref ContractStatusTable
diff --git a/unicorn_web/Data/property_data.json b/unicorn_web/Data/property_data.json
@@ -1,6 +1,6 @@
 [
   {
-      "PK": "PROPERTY#usa#anytown",
+      "PK": "property#usa#anytown",
       "SK": "main-street#111",
       "country": "USA",
       "city": "Anytown",
@@ -19,7 +19,7 @@
       "status": "PENDING"
   },
   {
-      "PK": "PROPERTY#usa#main-town",
+      "PK": "property#usa#main-town",
       "SK": "my-street#222",
       "country": "USA",
       "city": "Main Town",
@@ -38,7 +38,7 @@
       "status": "PENDING"
   },
   {
-      "PK": "PROPERTY#usa#anytown",
+      "PK": "property#usa#anytown",
       "SK": "main-street#333",
       "country": "USA",
       "city": "Anytown",
diff --git a/unicorn_web/PropertyFunctions/src/main/java/property/dao/Property.java b/unicorn_web/PropertyFunctions/src/main/java/property/dao/Property.java
@@ -48,6 +48,8 @@ public void setSk(String sk) {
         this.sk = sk;
     }
 
+    @JsonIgnore
+    @software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbIgnore
     public String getId() {
         return (getPk() + '/' + getSk()).replace('#', '/');
     }
@@ -80,6 +82,7 @@ public void setStreet(String street) {
         this.street = street;
     }
 
+    @DynamoDbAttribute(value = "number")
     public String getPropertyNumber() {
         return propertyNumber;
     }
diff --git a/unicorn_web/PropertyFunctions/src/main/java/property/requestapproval/PublicationApprovedFunction.java b/unicorn_web/PropertyFunctions/src/main/java/property/requestapproval/PublicationApprovedFunction.java
@@ -85,7 +85,18 @@ private void publicationApproved(String evaluationResult, String propertyId) {
 
                 Key key = Key.builder().partitionValue(strPartionKey).sortValue(strSortKey).build();
                 Property existingProperty = propertyTable.getItem(key).join();
+                
+                if (existingProperty == null) {
+                    logger.error("Property not found for ID: {}", propertyId);
+                    throw new RuntimeException("Property not found with ID: " + propertyId);
+                }
+                
+                // Always set the property number explicitly to ensure it's correct
+                existingProperty.setPropertyNumber(number);
                 existingProperty.setStatus(evaluationResult);
+                
+                logger.info("Updating property with status: {} and propertyNumber: {}", 
+                           evaluationResult, existingProperty.getPropertyNumber());
                 propertyTable.putItem(existingProperty).join();
         }
 
diff --git a/unicorn_web/PropertyFunctions/src/main/java/property/search/PropertySearchFunction.java b/unicorn_web/PropertyFunctions/src/main/java/property/search/PropertySearchFunction.java
@@ -141,8 +141,7 @@ public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEv
 
         return response
                 .withStatusCode(200)
-                .withBody(String.format("{ \"message\": \"Properties\",  \"requestdetails\": \"%s\" }",
-                        responseString));
+                .withBody(responseString);
     }
 
     public List<Property> queryTable(String partitionkey, String sortKey) throws Exception {
diff --git a/unicorn_web/template.yaml b/unicorn_web/template.yaml
@@ -141,7 +141,7 @@ Resources:
       CodeUri: PropertyFunctions
       Handler: property.requestapproval.PublicationApprovedFunction::handleRequest
       Policies:
-        - DynamoDBWritePolicy:
+        - DynamoDBCrudPolicy:
             TableName: !Ref WebTable
       EventInvokeConfig:
         DestinationConfig:

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": "{ \"contract_last_modified_on\": 1669385541019, \"contract_id\": \"f2bedc80-3dc8-4544-9140-9b606d71a6ee\", \"property_id\": \"usa/anytown/main-street/111\", \"contract_status\": \"APPROVED\" }"`
`7`	`7`	`}`
`8`	`8`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"DetailType": "PublicationApprovalRequested",`
`4`		`- "Source": "unicorn.properties.web",`
`5`		`- "EventBusName": "UnicornPropertiesEventBus-Local",`
	`4`	`+ "Source": "unicorn.web",`
	`5`	`+ "EventBusName": "UnicornPropertiesBus-local",`
`6`	`6`	"Detail": "{\"property_id\":\"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\":[\"property_images/prop1_exterior1.jpg\",\"property_images/prop1_interior1.jpg\",\"property_images/prop1_interior2.jpg\",\"property_images/prop1_interior3.jpg\"]}"
`7`	`7`	`}`
`8`	`8`	`]`