Unverified Commit c652876d authored by Guillermo Sanz López's avatar Guillermo Sanz López Committed by GitHub
Browse files

Merge pull request #3 from Telefonica/deploy-mine 

Deploy mine
parents 0901ad31 602d2b65

capif_backend/backoffice_service/controllers/default_controller.py

+6 −6
Original line number Diff line number Diff line
@@ -118,12 +118,12 @@ def delete_user(username, password): 
        return jsonify(message="Invalid parameters", object=None), 400

    return operations.delete_user(username, password)



# @backoffice_routes.route("/apis", methods=["GET"])

# @jwt_required()

# def get_apis():

#     return operations.get_apis()



@backoffice_routes.route("/apis", methods=["GET"])

@jwt_required()

def get_apis():

    return "exito"
 
    return operations.get_apis()



@backoffice_routes.route("/apis/num", methods=["GET"])

@jwt_required()

def get_num_apis():    

    return operations.get_num_apis()

capif_backend/backoffice_service/core/operations.py

+20 −15
Original line number Diff line number Diff line 
from flask import jsonify

from flask import jsonify, make_response

from ..db.db import MongoDatabse

import requests

from ..configs.config import Config
@@ -255,19 +255,24 @@ class Operations: 
            # Devolver un mensaje de error en caso de excepción

            return jsonify(message=f"Error deleting user: {str(e)}"), 500

    

    def get_apis(self):

        mycol = self.db.get_col_by_name(self.db.services)

        apis = mycol.find({}, {"_id": 0})



    # def get_apis(self):

    #     try:

    #         # Carga la lista de providers

    #         json_providers = self.retrieve_providers()

    #         providers_with_details = []

        json_apis = []

        for api in apis:

            json_apis.append(api)



    #         for provider in json_providers:

    #             details = self.get_provider_services(provider.get("api_prov_func_id", ""))

    #             provider["details"] = details

    #             providers_with_details.append(provider)

        return json_apis

    

    #         return jsonify("hola que tal"), 200

    def get_num_apis(self):

        try:

            # Carga la cadena JSON de las APIs y conviértela a un objeto Python

            json_apis = self.get_apis()

            num_apis = len(json_apis)

            

            return jsonify(num_apis), 200



    #     except Exception as e:

    #         return f"Error when retrieving apis: {e}"
 
        except Exception as e:

            # Devuelve una respuesta JSON con un mensaje de error

            return jsonify({"error": f"Error when retrieving number of APIs: {e}"}), 500

capif_backend/backoffice_service/db/db.py

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class MongoDatabse(): 
        mongo_register_hostname = os.getenv('MONGO_REGISTER_HOSTNAME', 'localhost')

        mongo_register_port = os.getenv('MONGO_REGISTER_PORT', '28017')

        

        uri = f"mongodb://{self.config['mongo_register']['user']}:{self.config['mongo_register']['password']}@mongo-register:27017"

        uri = f"mongodb://{self.config['mongo_register']['user']}:{self.config['mongo_register']['password']}@mongo_register:27017"

        print ("URI MONGO REGISTER: ", uri)

        #uri = "mongodb://" + self.config['mongo_register']['user'] + ":" + self.config['mongo_register']['password'] + "@" + os.getenv('MONGO_REGISTER_HOSTNAME') + ":" + os.getenv('MONGO_REGISTER_PORT')

        client = MongoClient(uri)

docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ services: 
      - VAULT_PORT=8200

      - MONGO_HOSTNAME=mongo

      - MONGO_PORT=27017

      - MONGO_REGISTER_HOSTNAME=mongo_register

      - MONGO_REGISTER_HOSTNAME=mongo-register

      - MONGO_REGISTER_PORT=28017

    restart: unless-stopped