Commit 44d792d8 authored by Stavros-Anastasios Charismiadis's avatar Stavros-Anastasios Charismiadis
Browse files

More fixes on responses

parent f67d1b46
Loading
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ from flask import current_app

from db.db import get_mongo
from ..models.ccf_instance_details import CcfInstanceDetails
from ..util import clean_empty, clean_n_camel_case, dict_to_camel_case
from ..util import clean_empty, clean_n_camel_case, dict_to_camel_case, serialize_clean_camel_case
# from ..vendor_specific import add_vend_spec_fields
from .auth_manager import AuthManager
from .publisher import Publisher
@@ -84,5 +84,6 @@ class CapifDomainOperations(Resource):
                return make_response("CCF already interconnected", 409)
            interconnected_col.insert_one(inter_ccf)

        res = make_response(object=clean_n_camel_case(inter_ccf), status=response.status_code)
        ccfinstancedetails_new = CcfInstanceDetails().from_dict(dict_to_camel_case(inter_ccf))
        res = make_response(object=ccfinstancedetails_new, status=response.status_code)
        return res
+3 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ from flask import current_app

from db.db import get_mongo
from ..models.ccf_instance_details import CcfInstanceDetails
from ..util import clean_empty, clean_n_camel_case, dict_to_camel_case, serialize_clean_camel_case
from ..util import clean_empty, clean_n_camel_case, dict_to_camel_case, serialize_clean
# from ..vendor_specific import add_vend_spec_fields
from .auth_manager import AuthManager
from .publisher import Publisher
@@ -66,5 +66,6 @@ class CcfInstanceOperations(Resource):
        current_app.logger.debug(ccfinstancedetails_dict)

        ccfinstancedetails_new = CcfInstanceDetails().from_dict(dict_to_camel_case(ccfinstancedetails_dict))
        res = make_response(object=serialize_clean_camel_case(ccfinstancedetails_new), status=201)
        current_app.logger.debug(ccfinstancedetails_new)
        res = make_response(object=serialize_clean(ccfinstancedetails_new), status=201)
        return res
 No newline at end of file
+7 −0
Original line number Diff line number Diff line
@@ -12,6 +12,13 @@ def serialize_clean_camel_case(obj):
    return res


def serialize_clean(obj):
    res = obj.to_dict()
    res = clean_empty(res)

    return res


def clean_n_camel_case(res):
    res = clean_empty(res)
    res = dict_to_camel_case(res)