Merge branch 'feature/v4' of https://github.com/pixlise/core into fea…

…ture/v4
pixlise · Nov 24, 2023 · f6ea4b5 · f6ea4b5
2 parents 74b2c57 + bd7227a
commit f6ea4b5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/api/ws/handlers/expression.go b/api/ws/handlers/expression.go
@@ -145,7 +145,6 @@ func createExpression(expr *protos.DataExpression, hctx wsHelpers.HandlerContext
 	if err != nil {
 		return nil, err
 	}
-
 	expr.Owner = wsHelpers.MakeOwnerSummary(ownerItem, hctx.SessUser, hctx.Svcs.MongoDB, hctx.Svcs.TimeStamper)
 	return expr, nil
 }

diff --git a/api/ws/handlers/quantification-retrieval.go b/api/ws/handlers/quantification-retrieval.go
@@ -12,7 +12,7 @@ import (
 )
 
 func HandleQuantListReq(req *protos.QuantListReq, hctx wsHelpers.HandlerContext) (*protos.QuantListResp, error) {
-	filter, _, err := wsHelpers.MakeFilter(req.SearchParams, false, protos.ObjectType_OT_QUANTIFICATION, hctx)
+	filter, idToOwner, err := wsHelpers.MakeFilter(req.SearchParams, false, protos.ObjectType_OT_QUANTIFICATION, hctx)
 	if err != nil {
 		return nil, err
 	}
@@ -35,6 +35,9 @@ func HandleQuantListReq(req *protos.QuantListReq, hctx wsHelpers.HandlerContext)
 
 	quants := []*protos.QuantificationSummary{}
 	for _, item := range items {
+		if owner, ok := idToOwner[item.Id]; ok {
+			item.Owner = wsHelpers.MakeOwnerSummary(owner, hctx.SessUser, hctx.Svcs.MongoDB, hctx.Svcs.TimeStamper)
+		}
 		quants = append(quants, item)
 	}
 
@@ -44,7 +47,7 @@ func HandleQuantListReq(req *protos.QuantListReq, hctx wsHelpers.HandlerContext)
 }
 
 func HandleQuantGetReq(req *protos.QuantGetReq, hctx wsHelpers.HandlerContext) (*protos.QuantGetResp, error) {
-	dbItem, _, err := wsHelpers.GetUserObjectById[protos.QuantificationSummary](false, req.QuantId, protos.ObjectType_OT_QUANTIFICATION, dbCollections.QuantificationsName, hctx)
+	dbItem, ownerItem, err := wsHelpers.GetUserObjectById[protos.QuantificationSummary](false, req.QuantId, protos.ObjectType_OT_QUANTIFICATION, dbCollections.QuantificationsName, hctx)
 	if err != nil {
 		return nil, err
 	}
@@ -62,6 +65,8 @@ func HandleQuantGetReq(req *protos.QuantGetReq, hctx wsHelpers.HandlerContext) (
 		}
 	}
 
+	dbItem.Owner = wsHelpers.MakeOwnerSummary(ownerItem, hctx.SessUser, hctx.Svcs.MongoDB, hctx.Svcs.TimeStamper)
+
 	return &protos.QuantGetResp{
 		Summary: dbItem,
 		Data:    quant,

diff --git a/api/ws/handlers/screen-configuration.go b/api/ws/handlers/screen-configuration.go
@@ -134,6 +134,7 @@ func writeScreenConfiguration(screenConfig *protos.ScreenConfiguration, hctx wsH
 			configuration.Name = screenConfig.Name
 			configuration.Tags = screenConfig.Tags
 			configuration.Description = screenConfig.Description
+			configuration.ScanConfigurations = screenConfig.ScanConfigurations
 
 			_, err = hctx.Svcs.MongoDB.Collection(dbCollections.ScreenConfigurationName).UpdateByID(sessCtx, screenConfig.Id, bson.D{{
 				Key:   "$set",
@@ -183,7 +184,7 @@ func writeScreenConfiguration(screenConfig *protos.ScreenConfiguration, hctx wsH
 		return nil, err
 	}
 
-	screenConfig.Owner = wsHelpers.MakeOwnerSummary(owner, hctx.SessUser, hctx.Svcs.MongoDB, hctx.Svcs.TimeStamper)
+	configuration.Owner = wsHelpers.MakeOwnerSummary(owner, hctx.SessUser, hctx.Svcs.MongoDB, hctx.Svcs.TimeStamper)
 
 	return configuration, nil
 }