Commit 1716fd74 authored by Stavros-Anastasios Charismiadis's avatar Stavros-Anastasios Charismiadis
Browse files

[Not totally working commit] rename the gateway file, change uvicorn worker

parent 8442cb43

services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/app.py

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ with open("/usr/src/app/api_provider_management/pubkey.pem", "rb") as pub_file: 
        pub_data = pub_file.read()



app = connexion.App(__name__, specification_dir='openapi/')

app.app.json_encoder = api_provider_management.encoder.JSONEncoder

app.app.json_encoder = api_provider_management.encoder.CustomJSONEncoder

app.add_api('openapi.yaml',

            arguments={'title': 'CAPIF_API_Provider_Management_API'},

            pythonic_params=True)

services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/config.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import os 
class Config:

	def __init__(self):

		self.cached = 0

		self.file="./config.yaml"

		self.file="../config.yaml"

		self.my_config = {}

		stamp = os.stat(self.file).st_mtime

		if stamp != self.cached:

services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/default_controller.py

+3 −2
Original line number Diff line number Diff line
@@ -108,9 +108,10 @@ def registrations_registration_id_put(registration_id, body): # noqa: E501 
    :rtype: APIProviderEnrolmentDetails

    """

    current_app.logger.info("Updating Provider Domain")

    if connexion.request.is_json:

        body = APIProviderEnrolmentDetails.from_dict(connexion.request.get_json())  # noqa: E501

    # if connexion.request.is_json:

    #     body = APIProviderEnrolmentDetails.from_dict(connexion.request.get_json())  # noqa: E501



    body = APIProviderEnrolmentDetails.from_dict(body)

    res = provider_management_ops.update_api_provider_enrolment_details(registration_id,body)



    return res

services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/individual_api_provider_enrolment_details_controller.py

+3 −3
Original line number Diff line number Diff line 
import connexion

from flask import Response, request, current_app

from ..core.provider_enrolment_details_api import ProviderManagementOperations

from ..encoder import JSONEncoder

from ..models.api_provider_enrolment_details import APIProviderEnrolmentDetails  # noqa: E501

from ..models.api_provider_enrolment_details_patch import APIProviderEnrolmentDetailsPatch  # noqa: E501

from ..models.problem_details import ProblemDetails  # noqa: E501
@@ -27,9 +26,10 @@ def modify_ind_api_provider_enrolment(registration_id, body): # noqa: E501 
    """



    current_app.logger.info("Patch Provider Domain")

    if connexion.request.is_json:

        body = APIProviderEnrolmentDetailsPatch.from_dict(connexion.request.get_json())  # noqa: E501

    # if connexion.request.is_json:

    #     body = APIProviderEnrolmentDetailsPatch.from_dict(connexion.request.get_json())  # noqa: E501



    body = APIProviderEnrolmentDetailsPatch.from_dict(body)

    res = provider_management_ops.update_api_provider_enrolment_details(registration_id, body)



    return res

services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/responses.py

+6 −6
Original line number Diff line number Diff line 
from ..models.problem_details import ProblemDetails

from ..encoder import JSONEncoder

from ..encoder import CustomJSONEncoder

from ..util import serialize_clean_camel_case

from flask import Response, current_app

import json
@@ -8,7 +8,7 @@ mimetype = "application/json" 




def make_response(object, status):

    res = Response(json.dumps(object, cls=JSONEncoder), status=status, mimetype=mimetype)

    res = Response(json.dumps(object, cls=CustomJSONEncoder), status=status, mimetype=mimetype)



    return res
@@ -17,25 +17,25 @@ def internal_server_error(detail, cause): 
    prob = ProblemDetails(title="Internal Server Error", status=500, detail=detail, cause=cause)

    prob = serialize_clean_camel_case(prob)



    return Response(json.dumps(prob, cls=JSONEncoder), status=500, mimetype=mimetype)

    return Response(json.dumps(prob, cls=CustomJSONEncoder), status=500, mimetype=mimetype)





def forbidden_error(detail, cause):

    prob = ProblemDetails(title="Forbidden", status=403, detail=detail, cause=cause)

    prob = serialize_clean_camel_case(prob)



    return Response(json.dumps(prob, cls=JSONEncoder), status=403, mimetype=mimetype)

    return Response(json.dumps(prob, cls=CustomJSONEncoder), status=403, mimetype=mimetype)





def bad_request_error(detail, cause, invalid_params):

    prob = ProblemDetails(title="Bad Request", status=400, detail=detail, cause=cause, invalid_params=invalid_params)

    prob = serialize_clean_camel_case(prob)



    return Response(json.dumps(prob, cls=JSONEncoder), status=400, mimetype=cause)

    return Response(json.dumps(prob, cls=CustomJSONEncoder), status=400, mimetype=cause)





def not_found_error(detail, cause):

    prob = ProblemDetails(title="Not Found", status=404, detail=detail, cause=cause)

    prob = serialize_clean_camel_case(prob)



    return Response(json.dumps(prob, cls=JSONEncoder), status=404, mimetype=mimetype)
 
 No newline at end of file
 
    return Response(json.dumps(prob, cls=CustomJSONEncoder), status=404, mimetype=mimetype)
 
 No newline at end of file