Commit 3319604b authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Fix problem with event checked on publish

parent ff1751d3

services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py

+10 −30
Original line number Original line Diff line number Diff line
@@ -133,7 +133,8 @@ class PublishServiceOperations(Resource): 
            if res.status_code == 201:

            if res.status_code == 201:

                current_app.logger.info("Service published")

                current_app.logger.info("Service published")

                event_to_send = self.service_api_availability_event(

                event_to_send = self.service_api_availability_event(

                    serviceapidescription)

                    clean_n_camel_case(

                        serviceapidescription_dict))

                RedisEvent(event_to_send,

                RedisEvent(event_to_send,

                           service_api_descriptions=[clean_n_camel_case(

                           service_api_descriptions=[clean_n_camel_case(

                               serviceapidescription.to_dict())],

                               serviceapidescription.to_dict())],
@@ -287,30 +288,12 @@ class PublishServiceOperations(Resource): 
            if response.status_code == 200:

            if response.status_code == 200:

                RedisEvent("SERVICE_API_UPDATE",

                RedisEvent("SERVICE_API_UPDATE",

                           service_api_descriptions=[service_api_description_updated]).send_event()

                           service_api_descriptions=[service_api_description_updated]).send_event()

                current_app.logger.debug("1")



                current_app.logger.debug(serviceapidescription_old)

                my_service_api = clean_n_camel_case(serviceapidescription_old)

                my_service_api = dict_to_camel_case(serviceapidescription_old)

                current_app.logger.debug("2")

                current_app.logger.debug(my_service_api)

                my_service_api = clean_empty(my_service_api)

                current_app.logger.debug("3")

                current_app.logger.debug(my_service_api)

                my_service_old = ServiceAPIDescription.from_dict(json.dumps(my_service_api, cls=CustomJSONEncoder))

                current_app.logger.debug(my_service_old.to_dict())

                # my_service_api = dict_to_camel_case(serviceapidescription_old)

                # current_app.logger.debug("2")

                # current_app.logger.debug(my_service_api)

                # my_service_api = clean_empty(my_service_api)

                # current_app.logger.debug("3")

                # current_app.logger.debug(my_service_api)

                # my_service_api_old = ServiceAPIDescription.from_dict(

                #     my_service_api)

                # current_app.logger.debug("4")

                # current_app.logger.debug(my_service_api)

                self.send_events_on_update(

                self.send_events_on_update(

                    service_api_id,

                    service_api_id,

                    my_service_old,

                    my_service_api,

                    result)

                    service_api_description_updated)





            return response

            return response
@@ -326,12 +309,8 @@ class PublishServiceOperations(Resource): 
        current_app.logger.debug("send Events if needed")

        current_app.logger.debug("send Events if needed")

        service_api_status_event_old = self.service_api_availability_event(

        service_api_status_event_old = self.service_api_availability_event(

            service_api_description_old)

            service_api_description_old)

        current_app.logger.debug("A1")

        service_api_status_event_new = self.service_api_availability_event(

        service_api_status_event_new = self.service_api_availability_event(

            service_api_description_old)

            service_api_description_old)

        current_app.logger.debug("A2")

        current_app.logger.debug(service_api_status_event_old)

        current_app.logger.debug(service_api_status_event_new)





        if service_api_status_event_old == service_api_status_event_new:

        if service_api_status_event_old == service_api_status_event_new:

            current_app.logger.info(

            current_app.logger.info(
@@ -349,10 +328,10 @@ class PublishServiceOperations(Resource): 




    def service_api_availability_event(self, service_api_description):

    def service_api_availability_event(self, service_api_description):

        service_api_status = ""

        service_api_status = ""

        if ServiceAPIDescription.return_supp_feat_dict(service_api_description.supported_features)["ApiStatusMonitoring"]:

        if ServiceAPIDescription.return_supp_feat_dict(service_api_description.get("supportedFeatures"))["ApiStatusMonitoring"]:

            current_app.logger.info(

            current_app.logger.info(

                "ApiStatusMonitoring active")

                "ApiStatusMonitoring active")

            if service_api_description.api_status is None or len(service_api_description.api_status.aef_ids) > 0:

            if service_api_description.get("apiStatus") is None or len(service_api_description.get("apiStatus").get("aefIds")) > 0:

                current_app.logger.info(

                current_app.logger.info(

                    "Service available, at least one AEF is available")

                    "Service available, at least one AEF is available")

                service_api_status = "SERVICE_API_AVAILABLE"

                service_api_status = "SERVICE_API_AVAILABLE"
@@ -361,6 +340,7 @@ class PublishServiceOperations(Resource): 
                    "Service unavailable, all AEFs are unavailable")

                    "Service unavailable, all AEFs are unavailable")

                service_api_status = "SERVICE_API_UNAVAILABLE"

                service_api_status = "SERVICE_API_UNAVAILABLE"

        else:

        else:

            current_app.logger.info("ApiStatusMonitoring")

            current_app.logger.info("Service available")

            current_app.logger.info("Service available")

            service_api_status = "SERVICE_API_AVAILABLE"

            service_api_status = "SERVICE_API_AVAILABLE"

        return service_api_status
 
        return service_api_status