Commit 30169a2b authored by Pelayo Torres's avatar Pelayo Torres
Browse files

fix eventFilter SERVICE_API_AVAILABLE

parent 5517eedd
Loading
Loading
Loading
Loading
Loading
+18 −6
Original line number Diff line number Diff line
@@ -254,7 +254,8 @@ class PublishServiceOperations(Resource):
                                                                  "pub_api_path": 1,
                                                                  "ccf_id": 1,
                                                                  "apf_id":1,
                                                                  "onboarding_date": 1})
                                                                  "onboarding_date": 1,
                                                                  "api_status": 1})
            if serviceapidescription_old is None:
                current_app.logger.error(service_api_not_found_message)
                return not_found_error(detail="Service API not existing", cause="Service API id not found")
@@ -268,6 +269,7 @@ class PublishServiceOperations(Resource):
            service_api_description["onboarding_date"] = serviceapidescription_old["onboarding_date"]
            service_api_description["api_id"] = serviceapidescription_old["api_id"]


            result = mycol.find_one_and_replace(
                serviceapidescription_old,
                service_api_description,
@@ -286,7 +288,6 @@ class PublishServiceOperations(Resource):
                return_document=ReturnDocument.AFTER, upsert=False)

            result = clean_empty(result)

            current_app.logger.debug("Updated service api")

            service_api_description_updated = dict_to_camel_case(result)
@@ -298,7 +299,13 @@ class PublishServiceOperations(Resource):
                RedisEvent("SERVICE_API_UPDATE",
                           service_api_descriptions=[service_api_description_updated]).send_event()

                my_service_api = clean_n_camel_case(serviceapidescription_old)
                my_service_api = clean_empty(serviceapidescription_old)

                if (api_status := serviceapidescription_old.get("api_status")):
                    my_service_api["api_status"] = api_status
                
                my_service_api = dict_to_camel_case(my_service_api)
                
                self.send_events_on_update(
                    service_api_id,
                    my_service_api,
@@ -368,7 +375,6 @@ class PublishServiceOperations(Resource):

            service_api_description_updated = dict_to_camel_case(result)

            current_app.logger.debug(service_api_description_updated)
            response = make_response(
                object=service_api_description_updated, status=200)

@@ -376,7 +382,13 @@ class PublishServiceOperations(Resource):
                RedisEvent("SERVICE_API_UPDATE",
                           service_api_descriptions=[service_api_description_updated]).send_event()

                my_service_api = clean_n_camel_case(serviceapidescription_old)
                my_service_api = clean_empty(serviceapidescription_old)

                if (api_status := serviceapidescription_old.get("api_status")):
                    my_service_api["api_status"] = api_status
                
                my_service_api = dict_to_camel_case(my_service_api)

                self.send_events_on_update(
                    service_api_id,
                    my_service_api,
@@ -398,7 +410,7 @@ class PublishServiceOperations(Resource):
        service_api_status_event_old = self.service_api_availability_event(
            service_api_description_old)
        service_api_status_event_new = self.service_api_availability_event(
            service_api_description_old)
            service_api_description_new)

        if service_api_status_event_old == service_api_status_event_new:
            current_app.logger.info(