Merge pull request #3133 from gravitl/NET-1613-nodes

fix tag udpate with new ID
gravitl · Sep 22, 2024 · f1a1ab5 · f1a1ab5
2 parents 5e385c8 + ad4c663
commit f1a1ab5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/controllers/tags.go b/controllers/tags.go
@@ -143,6 +143,8 @@ func updateTag(w http.ResponseWriter, r *http.Request) {
 			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 			return
 		}
+		// delete old Tag entry
+		logic.DeleteTag(updateTag.ID)
 	}
 	go logic.UpdateTag(updateTag, newID)
 	logic.ReturnSuccessResponse(w, r, "updating tags")

diff --git a/logic/tags.go b/logic/tags.go
@@ -15,7 +15,7 @@ var tagMutex = &sync.RWMutex{}
 // GetTag - fetches tag info
 func GetTag(tagID models.TagID) (models.Tag, error) {
 	data, err := database.FetchRecord(database.TAG_TABLE_NAME, tagID.String())
-	if err != nil && !database.IsEmptyRecord(err) {
+	if err != nil {
 		return models.Tag{}, err
 	}
 	tag := models.Tag{}
@@ -137,11 +137,21 @@ func UpdateTag(req models.UpdateTagReq, newID models.TagID) {
 			if node.Tags == nil {
 				node.Tags = make(map[models.TagID]struct{})
 			}
-			node.Tags[req.ID] = struct{}{}
+			if newID != "" {
+				node.Tags[newID] = struct{}{}
+			} else {
+				node.Tags[req.ID] = struct{}{}
+			}
 			UpsertNode(&node)
 		} else {
+			if newID != "" {
+				delete(node.Tags, req.ID)
+				node.Tags[newID] = struct{}{}
+				UpsertNode(&node)
+			}
 			delete(tagNodesMap, node.ID.String())
 		}
+
 	}
 	for _, deletedTaggedNode := range tagNodesMap {
 		deletedTaggedHost := deletedTaggedNode