change database query options (b45b0af9) · Commits · OCF / capif

services/helper/helper_service/app.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ config = Config().get_config()

		# Connect MongoDB and get TTL for superadmin certificate
		db = MongoDatabse()
		capif_config = db.get_col_by_name("capif_configuration").find_one({"config_name": "default"})
		capif_config = db.get_col_by_name("capif_configuration").find_one({})
		ttl_superadmin_cert = capif_config["settings"]["certificates_expiry"].get("ttl_superadmin_cert", "43000h")

		# Setting log level

services/helper/helper_service/core/helper_operations.py

+6 −7

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ class HelperOperations:
		"""Recupera toda la configuración actual"""
		current_app.logger.debug("Retrieving current CAPIF configuration")
		config_col = self.db.get_col_by_name(self.db.capif_configuration)
		config = config_col.find_one({"config_name": "default"}, {"_id": 0})
		config = config_col.find_one({}, {"_id": 0})

		if not config:
		return jsonify(message="No CAPIF configuration found"), 404
		@@ -224,8 +224,7 @@ class HelperOperations:

		# Construir el query dinámico para actualizar un parámetro específico
		update_query = {"$set": {param_path: new_value}}

		result = config_col.update_one({"config_name": "default"}, update_query)
		result = config_col.update_one({}, update_query)

		if result.modified_count == 0:
		return jsonify(message=f"No configuration found or parameter '{param_path}' not updated"), 404
		@@ -242,7 +241,7 @@ class HelperOperations:
		config_col = self.db.get_col_by_name(self.db.capif_configuration)

		# Reemplazar la configuración existente con la nueva
		result = config_col.replace_one({"config_name": "default"}, new_config, upsert=True)
		result = config_col.replace_one({}, new_config, upsert=True)

		if result.matched_count == 0:
		return jsonify(message="No existing configuration found; a new one was created"), 201
		@@ -262,7 +261,7 @@ class HelperOperations:
		# MongoDB $set para añadir la nueva categoría dentro de settings
		update_query = {"$set": {f"settings.{category_name}": category_values}}

		result = config_col.update_one({"config_name": "default"}, update_query)
		result = config_col.update_one({}, update_query)

		if result.modified_count == 0:
		return jsonify(message=f"No configuration found or category '{category_name}' not added"), 404
		@@ -275,7 +274,7 @@ class HelperOperations:
		config_col = self.db.get_col_by_name(self.db.capif_configuration)

		update_query = {"$set": {f"settings.{param_path}": new_value}}
		result = config_col.update_one({"config_name": "default"}, update_query)
		result = config_col.update_one({}, update_query)

		if result.modified_count == 0:
		return jsonify(message=f"No configuration found or parameter '{param_path}' not updated"), 404

services/register/register_service/app.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ config = Config().get_config()

		# Connect MongoDB and get TTL for superadmin certificate
		db = MongoDatabse()
		capif_config = db.get_col_by_name("capif_configuration").find_one({"config_name": "default"})
		capif_config = db.get_col_by_name("capif_configuration").find_one({})
		ttl_superadmin_cert = capif_config.get("settings", {}).get("certificates_expiry", {}).get("ttl_superadmin_cert", "43000h")

		# Setting log level

services/register/register_service/core/register_operations.py

+5 −5

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ class RegisterOperations:
		"""Retrieve the current register configuration from MongoDB"""
		current_app.logger.debug("Retrieving register configuration")
		config_col = self.db.get_col_by_name(self.db.capif_configuration)
		config = config_col.find_one({"config_name": "default"}, {"_id": 0})
		config = config_col.find_one({}, {"_id": 0})

		if not config:
		return jsonify(message="No register configuration found"), 404
		@@ -112,7 +112,7 @@ class RegisterOperations:
		config_col = self.db.get_col_by_name(self.db.capif_configuration)

		update_query = {"$set": {param_path: new_value}}
		result = config_col.update_one({"config_name": "default"}, update_query)
		result = config_col.update_one({}, update_query)

		if result.modified_count == 0:
		return jsonify(message=f"No configuration found or parameter '{param_path}' not updated"), 404
		@@ -124,7 +124,7 @@ class RegisterOperations:
		current_app.logger.debug("Replacing entire register configuration")
		config_col = self.db.get_col_by_name(self.db.capif_configuration)

		result = config_col.replace_one({"config_name": "default"}, new_config, upsert=True)
		result = config_col.replace_one({}, new_config, upsert=True)

		if result.matched_count == 0:
		return jsonify(message="No existing configuration found; a new one was created"), 201
		@@ -138,7 +138,7 @@ class RegisterOperations:
		config_col = self.db.get_col_by_name(self.db.capif_configuration)

		update_query = {"$set": {f"settings.{category_name}": category_values}}
		result = config_col.update_one({"config_name": "default"}, update_query)
		result = config_col.update_one({}, update_query)

		if result.modified_count == 0:
		return jsonify(message=f"No configuration found or category '{category_name}' not added"), 404
		@@ -152,7 +152,7 @@ class RegisterOperations:
		config_col = self.db.get_col_by_name(self.db.capif_configuration)

		update_query = {"$set": {f"settings.{param_path}": new_value}}
		result = config_col.update_one({"config_name": "default"}, update_query)
		result = config_col.update_one({}, update_query)

		if result.modified_count == 0:
		return jsonify(message=f"No configuration found or parameter '{param_path}' not updated"), 404

Admin message