Commit ea335a35 authored by Pelayo Torres's avatar Pelayo Torres
Browse files

Merge branch 'OCF105-discover-service-doesn-t-return-apistatus' into 'staging'

Resolve "Discover service doesn't return apiStatus"

Closes #105

See merge request !95
parents 2df4abec b2451c07
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ def filter_fields(filtered_apis):
    key_filter = [
        "api_name", "api_id", "aef_profiles", "description",
        "supported_features", "shareable_info", "service_api_category",
        "api_supp_feats", "pub_api_path", "ccf_id"
        "api_supp_feats", "pub_api_path", "ccf_id", "api_status"
    ]
    field_filtered_api = {}
    for key in filtered_apis.keys():
+8 −4
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ class PublishServiceOperations(Resource):
                 "service_api_category": 1,
                 "api_supp_feats": 1,
                 "pub_api_path": 1,
                 "ccf_id": 1})
                 "ccf_id": 1,
                 "api_status": 1})
            current_app.logger.debug(service)
            if service is None:
                current_app.logger.error("Not found services for this apf id")
@@ -166,7 +167,8 @@ class PublishServiceOperations(Resource):
                                                    "service_api_category": 1,
                                                    "api_supp_feats": 1,
                                                    "pub_api_path": 1,
                                                    "ccf_id": 1})
                                                    "ccf_id": 1,
                                                    "api_status": 1})
            if service_api is None:
                current_app.logger.error(service_api_not_found_message)
                return not_found_error(
@@ -250,7 +252,8 @@ class PublishServiceOperations(Resource):
                                                                  "service_api_category": 1,
                                                                  "api_supp_feats": 1,
                                                                  "pub_api_path": 1,
                                                                  "ccf_id": 1})
                                                                  "ccf_id": 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")
@@ -271,7 +274,8 @@ class PublishServiceOperations(Resource):
                            "service_api_category": 1,
                            "api_supp_feats": 1,
                            "pub_api_path": 1,
                            "ccf_id": 1},
                            "ccf_id": 1,
                            "api_status": 1},
                return_document=ReturnDocument.AFTER, upsert=False)

            result = clean_empty(result)