Merge pull request #241 from pixlise/development

Release v4.21.0

api/quantification/create.go

@@ -18,23 +18,28 @@
 package quantification
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"path"
 	"path/filepath"
 	"strings"
 	"sync"
 
+	"github.com/pixlise/core/v4/api/dbCollections"
 	"github.com/pixlise/core/v4/api/filepaths"
 	"github.com/pixlise/core/v4/api/job"
 	"github.com/pixlise/core/v4/api/piquant"
 	"github.com/pixlise/core/v4/api/quantification/quantRunner"
 	"github.com/pixlise/core/v4/api/services"
+	"github.com/pixlise/core/v4/api/specialUserIds"
 	"github.com/pixlise/core/v4/api/ws/wsHelpers"
 	"github.com/pixlise/core/v4/core/fileaccess"
 	"github.com/pixlise/core/v4/core/logger"
 	"github.com/pixlise/core/v4/core/utils"
 	protos "github.com/pixlise/core/v4/generated-protos"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 // JobParamsFileName - File name of job params file
@@ -382,7 +387,25 @@ func (r *quantNodeRunner) triggerPiquantNodes(wg *sync.WaitGroup) {
 		},
 	}
 
+	// If we've got a special import that's done by the internal user, we read the owner entry from DB scan auto share table (ScanAutoShareName)
 	ownerItem := wsHelpers.MakeOwnerForWrite(r.jobId, protos.ObjectType_OT_QUANTIFICATION, r.quantStartSettings.RequestorUserId, now)
+	if r.quantStartSettings.RequestorUserId == specialUserIds.PIXLISESystemUserId {
+		coll := svcs.MongoDB.Collection(dbCollections.ScanAutoShareName)
+		autoShareResult := coll.FindOne(context.TODO(), bson.D{{Key: "_id", Value: r.quantStartSettings.RequestorUserId}}, options.FindOne())
+		if autoShareResult.Err() != nil {
+			svcs.Log.Errorf("Failed to read auto-share info for quantification triggered by %v. Quant won't be shared", r.quantStartSettings.RequestorUserId)
+		} else {
+			autoEntry := &protos.ScanAutoShareEntry{}
+			err := autoShareResult.Decode(autoEntry)
+			if err != nil {
+				svcs.Log.Errorf("Failed to decode auto-share info for quantification triggered by %v: %v", r.quantStartSettings.RequestorUserId, err)
+			} else {
+				svcs.Log.Errorf("Found scan auto-share entry for quantification requestor \"%v\". Sharing accordingly.", r.quantStartSettings.RequestorUserId)
+				ownerItem.Viewers = autoEntry.Viewers
+				ownerItem.Editors = autoEntry.Editors
+			}
+		}
+	}
 
 	err = writeQuantAndOwnershipToDB(summary, ownerItem, svcs.MongoDB)
 	if err != nil {

api/ws/handlers/image-beam-location.go

@@ -60,7 +60,10 @@ func HandleImageBeamLocationsReq(req *protos.ImageBeamLocationsReq, hctx wsHelpe
 		result := coll.FindOne(ctx, bson.M{"_id": req.ImageName})
 		if result.Err() != nil {
 			if result.Err() == mongo.ErrNoDocuments {
-				return nil, errorwithstatus.MakeNotFoundError(req.ImageName)
+				// If there are no beam locations, don't return an error, just return a message with no items in it
+				return &protos.ImageBeamLocationsResp{
+					Locations: &protos.ImageLocations{ImageName: req.ImageName},
+				}, nil
 			}
 			return nil, result.Err()
 		}

api/ws/handlers/quantification-multi.go

@@ -11,6 +11,7 @@ import (
 	protos "github.com/pixlise/core/v4/generated-protos"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 // Anyone can retrieve a quant z-stack if they have quant messaging permissions
@@ -65,13 +66,15 @@ func HandleQuantCombineListWriteReq(req *protos.QuantCombineListWriteReq, hctx w
 		List:   req.List,
 	}
 
-	result, err := coll.InsertOne(ctx, doc)
+	opt := options.Update().SetUpsert(true)
+
+	result, err := coll.UpdateByID(ctx, zId, bson.D{{Key: "$set", Value: doc}}, opt)
 	if err != nil {
 		return nil, err
 	}
 
-	if result.InsertedID != zId {
-		hctx.Svcs.Log.Errorf("MultiQuant Z-Stack insert %v inserted different id %v", zId, result.InsertedID)
+	if result.UpsertedCount != 1 {
+		hctx.Svcs.Log.Errorf("MultiQuant Z-Stack write for: %v got unexpected DB write result: %+v", req.ScanId, result)
 	}
 
 	return &protos.QuantCombineListWriteResp{}, nil