Fixing bugs found with running integration tests

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

@@ -87,6 +87,9 @@ func HandleImageBeamLocationsReq(req *protos.ImageBeamLocationsReq, hctx wsHelpe
 			dbScanIds[scanLocs.ScanId] = true
 		}
 		scanBeamVersionsToReturn := req.ScanBeamVersions
+		if scanBeamVersionsToReturn == nil {
+			scanBeamVersionsToReturn = map[string]uint32{}
+		}
 
 		// If they didn't specify versions to return, return the latest version for each scan represented
 		if len(scanBeamVersionsToReturn) <= 0 {

api/ws/handlers/piquant.go

@@ -103,7 +103,7 @@ func HandlePiquantWriteCurrentVersionReq(req *protos.PiquantWriteCurrentVersionR
 		return nil, err
 	}
 
-	if result.MatchedCount != 1 {
+	if result.MatchedCount != 1 && result.UpsertedCount != 1 {
 		hctx.Svcs.Log.Errorf("PiquantWriteCurrentVersionReq UpdateByID result had unexpected counts %+v", result)
 	}
 

api/ws/wsHelpers/ownership.go

@@ -324,20 +324,28 @@ func GetUserIdsForGroup(groupIds []string, mongoDB *mongo.Database) ([]string, e
 	userIds := []string{}
 	for _, group := range groups {
 		// Pull in the users
-		for _, userId := range group.Viewers.UserIds {
-			userIds = append(userIds, userId)
+		if group.Viewers != nil {
+			for _, userId := range group.Viewers.UserIds {
+				userIds = append(userIds, userId)
+			}
 		}
-		for _, userId := range group.Members.UserIds {
-			userIds = append(userIds, userId)
+		if group.Members != nil {
+			for _, userId := range group.Members.UserIds {
+				userIds = append(userIds, userId)
+			}
 		}
 
 		// Recurse into groups
 		groupIds := []string{}
-		for _, groupId := range group.Viewers.GroupIds {
-			groupIds = append(groupIds, groupId)
+		if group.Viewers != nil {
+			for _, groupId := range group.Viewers.GroupIds {
+				groupIds = append(groupIds, groupId)
+			}
 		}
-		for _, groupId := range group.Members.GroupIds {
-			groupIds = append(groupIds, groupId)
+		if group.Members != nil {
+			for _, groupId := range group.Members.GroupIds {
+				groupIds = append(groupIds, groupId)
+			}
 		}
 
 		usersForGroup, err := GetUserIdsForGroup(groupIds, mongoDB)