Address lingering count changes

Author: dacharyc

audit/gdcd/compare-code-examples/HandleNewPageNodes.go

@@ -18,7 +18,7 @@ func HandleNewPageNodes(newIncomingPageNodes []types.ASTNodeWrapper, llm *ollama
 		newNode := snooty.MakeCodeNodeFromSnootyAST(incomingNode.Node, llm, ctx, isDriversProject)
 		if incomingNode.InstancesOnPage > 1 {
 			newNode.InstancesOnPage = incomingNode.InstancesOnPage
-			newCodeNodeCount += newNode.InstancesOnPage
+			newCodeNodeCount += incomingNode.InstancesOnPage
 		} else {
 			newCodeNodeCount++
 		}

audit/gdcd/compare-code-examples/HandleRemovedCodeNodes.go

@@ -10,12 +10,20 @@ import (
 // updated code nodes. We don't just remove the nodes directly because we want to maintain a count of codes that we
 // have removed - i.e. if we remove removed nodes, and add new nodes, the count stays the same and we can't track
 // net new code examples.
-func HandleRemovedCodeNodes(removedCodeNodes []common.CodeNode) []common.CodeNode {
+func HandleRemovedCodeNodes(removedCodeNodes []common.CodeNode) ([]common.CodeNode, int) {
 	updatedRemovedNodes := make([]common.CodeNode, 0)
+	updatedRemovedCodeNodeCount := 0
 	for _, node := range removedCodeNodes {
 		node.IsRemoved = true
 		node.DateRemoved = time.Now()
+		if node.InstancesOnPage > 1 {
+			updatedRemovedCodeNodeCount += node.InstancesOnPage
+			node.InstancesOnPage = 0
+		} else {
+			updatedRemovedCodeNodeCount++
+		}
+		node.InstancesOnPage = 0
 		updatedRemovedNodes = append(updatedRemovedNodes, node)
 	}
-	return updatedRemovedNodes
+	return updatedRemovedNodes, updatedRemovedCodeNodeCount
 }

audit/gdcd/compare-code-examples/HandleUpdatedPageNodes.go

@@ -23,9 +23,9 @@ func HandleUpdatedPageNodes(updatedPageNodes []types.ASTNodeWrapper, incomingSha
 		codeNode.Code = whiteSpaceTrimmedString
 		codeNode.SHA256Hash = hash
 		codeNode.DateUpdated = time.Now()
-		if incomingNode.InstancesOnPage != 0 {
+		if incomingNode.InstancesOnPage > 1 {
 			codeNode.InstancesOnPage = incomingNode.InstancesOnPage
-			updatedCodeNodeCount += codeNode.InstancesOnPage
+			updatedCodeNodeCount += incomingNode.InstancesOnPage
 		} else {
 			updatedCodeNodeCount++
 		}

audit/gdcd/compare-code-examples/MakeUpdatedCodeNodesArray.go

@@ -34,7 +34,7 @@ func MakeUpdatedCodeNodesArray(removedCodeNodes []common.CodeNode,
 
 	newCodeNodes, newCodeNodeCount := HandleNewPageNodes(newPageNodes, llm, ctx, isDriversProject)
 
-	removedCodeNodesUpdatedForRemoval := HandleRemovedCodeNodes(removedCodeNodes)
+	removedCodeNodesUpdatedForRemoval, newRemovedCodeNodesCount := HandleRemovedCodeNodes(removedCodeNodes)
 
 	if len(newCodeNodes) > 0 {
 		for _, node := range newCodeNodes {
@@ -55,7 +55,7 @@ func MakeUpdatedCodeNodesArray(removedCodeNodes []common.CodeNode,
 	aggregateCodeNodeCount := GetCodeNodeCount(aggregateCodeNodeChanges)
 
 	// Increment project counters
-	report = UpdateProjectReportForUpdatedCodeNodes(report, pageId, incomingCount, unchangedPageNodeCount, updatedCodeNodeCount, newCodeNodeCount, len(removedCodeNodesUpdatedForRemoval), aggregateCodeNodeCount, newAppliedUsageExampleCounts)
+	report = UpdateProjectReportForUpdatedCodeNodes(report, pageId, incomingCount, unchangedPageNodeCount, updatedCodeNodeCount, newCodeNodeCount, newRemovedCodeNodesCount, aggregateCodeNodeCount, newAppliedUsageExampleCounts)
 	// We don't want to report on any of the removed code nodes that were already on the page, but we do want to keep them
 	// around, so append them to the Nodes array after adding and reporting on the new stuff
 	aggregateCodeNodeChanges = append(aggregateCodeNodeChanges, existingRemovedCodeNodes...)