Commit 05d50bb2 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Code refactor con publish events

parent 3990bdeb

services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py

+9 −24
Original line number Diff line number Diff line
@@ -132,24 +132,9 @@ class PublishServiceOperations(Resource): 


            if res.status_code == 201:

                current_app.logger.info("Service published")

                if serviceapidescription.return_supp_feat_dict(serviceapidescription.supported_features)["ApiStatusMonitoring"]:

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

                        current_app.logger.info(

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

                        RedisEvent("SERVICE_API_AVAILABLE",

                                   service_api_descriptions=[clean_n_camel_case(

                                       serviceapidescription.to_dict())],

                                   api_ids=[str(api_id)]).send_event()

                    else:

                        current_app.logger.info(

                            "Service unavailable, all AEFs are unavailable")

                        RedisEvent("SERVICE_API_UNAVAILABLE",

                                   service_api_descriptions=[clean_n_camel_case(

                                       serviceapidescription.to_dict())],

                                   api_ids=[str(api_id)]).send_event()

                else:

                    current_app.logger.info(f"Service available")

                    RedisEvent("SERVICE_API_AVAILABLE",

                event_to_send = self.service_api_availability_event(

                    serviceapidescription)

                RedisEvent(event_to_send,

                           service_api_descriptions=[clean_n_camel_case(

                               serviceapidescription.to_dict())],

                           api_ids=[str(api_id)]).send_event()
@@ -313,9 +298,9 @@ class PublishServiceOperations(Resource): 
                              service_api_decription_old,

                              service_api_description_new):



        service_api_status_event_old = self.service_api_status_event(

        service_api_status_event_old = self.service_api_availability_event(

            service_api_decription_old)

        service_api_status_event_new = self.service_api_status_event(

        service_api_status_event_new = self.service_api_availability_event(

            service_api_decription_old)



        if service_api_status_event_old == service_api_status_event_new:
@@ -332,7 +317,7 @@ class PublishServiceOperations(Resource): 
                           service_api_description_new],

                       api_ids=[str(service_api_id)]).send_event()



    def service_api_status_event(service_api_description):

    def service_api_availability_event(service_api_description):

        service_api_status = ""

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

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