Merge pull request #43 from islax/getTenantSettingByName

Get tenant setting by name
islax · Jan 7, 2022 · 656c2d9 · 656c2d9
2 parents 644e059 + a8a182f
commit 656c2d9
Showing 1 changed file with 26 additions and 2 deletions.
diff --git a/settingsmetadata/controllers/SettingsMetadataController.go b/settingsmetadata/controllers/SettingsMetadataController.go
@@ -195,7 +195,7 @@ func (controller *SettingsMetadataController) update(w http.ResponseWriter, r *h
 
 	context.LoggerEventActionCompletion().Str("TenantId", responseDTO.ID.String()).Msg("Tenant settings updated")
 	controller.app.DispatchEvent(token.Raw, context.GetCorrelationID(), strings.ToLower(strings.ReplaceAll(controller.app.Name, " ", ""))+".settingsupdated", toDTO(tenant))
-	microappWeb.RespondJSON(w, http.StatusOK, responseDTO)
+	microappWeb.RespondJSON(w, http.StatusOK, nil)
 }
 
 func (controller *SettingsMetadataController) getByName(w http.ResponseWriter, r *http.Request, token *microappSecurity.JwtToken) {
@@ -205,16 +205,40 @@ func (controller *SettingsMetadataController) getByName(w http.ResponseWriter, r
 
 	params := mux.Vars(r)
 	stringTenantID := params["id"]
-	//var settingsName interface{}
+	globalTenantSettings := make(map[string]interface{})
 	tenantID, err := tenantService.GetTenantIDFromToken().GetTenantIDAsUUID(params, token, stringTenantID)
 	if err != nil {
 		context.LogError(err, microappLog.MessageUnableToFindURLResource)
 		microappWeb.RespondError(w, err)
 		return
 	}
 
+	if err := controller.checkAndInitializeSettingsMetadata(); err != nil {
+		context.LogError(err, fmt.Sprintf(microappLog.MessageGenericErrorTemplate, "initializing settings-metadata"))
+		microappWeb.RespondError(w, err)
+		return
+	}
+
 	tenant, err := controller.getTenant(context, uow, controller.repository, tenantID)
 	if err != nil {
+		context.LogError(err, fmt.Sprintf(microappLog.MessageGenericErrorTemplate, "getting tenant from database"))
+		microappWeb.RespondError(w, err)
+		return
+	}
+
+	if tenantID.String() != "00000000-0000-0000-0000-000000000000" {
+		globalTenant, err := controller.getTenant(context, uow, controller.repository, uuid.FromStringOrNil("00000000-0000-0000-0000-000000000000"))
+		if err != nil {
+			context.LogError(err, fmt.Sprintf(microappLog.MessageGenericErrorTemplate, "getting global tenant from database"))
+			microappWeb.RespondError(w, err)
+			return
+		}
+		globalTenantSettings, _ = globalTenant.GetSettings()
+	}
+
+	err = tenant.GetTenantSettings(controller.settingsMetadatas, globalTenantSettings)
+	if err != nil {
+		context.LogError(err, fmt.Sprintf(microappLog.MessageGenericErrorTemplate, "getting tenant settings from database"))
 		microappWeb.RespondError(w, err)
 		return
 	}