fixed the users list in app details endpoint by adding a keto validation

factly · Sep 5, 2022 · 079ea3b · 079ea3b
1 parent 4da5662
commit 079ea3b
Showing 1 changed file with 31 additions and 1 deletion.
diff --git a/server/action/organisation/application/details.go b/server/action/organisation/application/details.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 
 	"github.com/factly/kavach-server/model"
+	keto "github.com/factly/kavach-server/util/keto/relationTuple"
 	"github.com/factly/kavach-server/util/user"
 	"github.com/factly/x/errorx"
 	"github.com/factly/x/loggerx"
@@ -72,14 +73,43 @@ func details(w http.ResponseWriter, r *http.Request) {
 		Base: model.Base{
 			ID: uint(appID),
 		},
-	}).Preload("Users").Preload("Medium").Find(&app).Error
+	}).Preload("Medium").Find(&app).Error
 
 	if err != nil {
 		loggerx.Error(err)
 		errorx.Render(w, errorx.Parser(errorx.DBError()))
 		return
 	}
 
+	userIDs, err := keto.ListSubjectsByObjectID(namespace, "", fmt.Sprintf("org:%d:app:%d", orgID, appID))
+	if err != nil {
+		loggerx.Error(err)
+		errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
+		return
+	}
+
+	for _, userID := range userIDs {
+		uID, err := strconv.Atoi(userID)
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DecodeError()))
+			return
+		}
+
+		var userModel model.User
+		err = model.DB.Model(&model.User{}).Where(&model.User{
+			Base: model.Base{
+				ID: uint(uID),
+			},
+		}).Preload("Medium").First(&userModel).Error
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.DBError()))
+			return
+		}
+		app.Users = append(app.Users, userModel)
+	}
+
 	err = model.DB.Model(&model.Space{}).Where(&model.Space{
 		ApplicationID:  uint(appID),
 		OrganisationID: uint(orgID),