fix(amazonFeatureDev): accepted files telemetry aws#4689

Problem
File acceptance telemetry was not counting deleted files, i.e. the files that code generation marked to be deleted, even if they were rejected or not.

Solution
Count deleted files for the metric and add tests to assure this.

Author: sannicm

packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts

@@ -449,9 +449,15 @@ export class FeatureDevController {
         let session
         try {
             session = await this.sessionStorage.getSession(message.tabID)
+
+            const acceptedFiles = (paths?: { rejected: boolean }[]) => (paths || []).filter(i => !i.rejected).length
+
+            const amazonqNumberOfFilesAccepted =
+                acceptedFiles(session.state.filePaths) + acceptedFiles(session.state.deletedFiles)
+
             telemetry.amazonq_isAcceptedCodeChanges.emit({
                 amazonqConversationId: session.conversationId,
-                amazonqNumberOfFilesAccepted: session.state.filePaths?.filter(i => !i.rejected).length ?? -1,
+                amazonqNumberOfFilesAccepted,
                 enabled: true,
                 result: 'Succeeded',
             })

packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts

@@ -8,13 +8,23 @@ import * as assert from 'assert'
 import * as path from 'path'
 import sinon from 'sinon'
 import { waitUntil } from '../../../../shared/utilities/timeoutUtils'
-import { ControllerSetup, createController, createSession } from '../../utils'
-import { CurrentWsFolders, FollowUpTypes, createUri } from '../../../../amazonqFeatureDev/types'
+import { ControllerSetup, createController, createSession, generateVirtualMemoryUri } from '../../utils'
+import {
+    CurrentWsFolders,
+    FollowUpTypes,
+    createUri,
+    NewFileInfo,
+    DeletedFileInfo,
+} from '../../../../amazonqFeatureDev/types'
 import { Session } from '../../../../amazonqFeatureDev/session/session'
 import { Prompter } from '../../../../shared/ui/prompter'
 import { assertTelemetry, toFile } from '../../../testUtil'
 import { SelectedFolderNotInWorkspaceFolderError } from '../../../../amazonqFeatureDev/errors'
-import { CodeGenState, PrepareRefinementState } from '../../../../amazonqFeatureDev/session/sessionState'
+import {
+    CodeGenState,
+    PrepareCodeGenState,
+    PrepareRefinementState,
+} from '../../../../amazonqFeatureDev/session/sessionState'
 import { FeatureDevClient } from '../../../../amazonqFeatureDev/client/featureDev'
 
 let mockGetCodeGeneration: sinon.SinonStub
@@ -26,6 +36,40 @@ describe('Controller', () => {
     let session: Session
     let controllerSetup: ControllerSetup
 
+    const getFilePaths = (controllerSetup: ControllerSetup): NewFileInfo[] => [
+        {
+            zipFilePath: 'myfile1.js',
+            relativePath: 'myfile1.js',
+            fileContent: '',
+            rejected: false,
+            virtualMemoryUri: generateVirtualMemoryUri(uploadID, 'myfile1.js'),
+            workspaceFolder: controllerSetup.workspaceFolder,
+        },
+        {
+            zipFilePath: 'myfile2.js',
+            relativePath: 'myfile2.js',
+            fileContent: '',
+            rejected: true,
+            virtualMemoryUri: generateVirtualMemoryUri(uploadID, 'myfile2.js'),
+            workspaceFolder: controllerSetup.workspaceFolder,
+        },
+    ]
+
+    const getDeletedFiles = (): DeletedFileInfo[] => [
+        {
+            zipFilePath: 'myfile3.js',
+            relativePath: 'myfile3.js',
+            rejected: false,
+            workspaceFolder: controllerSetup.workspaceFolder,
+        },
+        {
+            zipFilePath: 'myfile4.js',
+            relativePath: 'myfile4.js',
+            rejected: true,
+            workspaceFolder: controllerSetup.workspaceFolder,
+        },
+    ]
+
     before(() => {
         sinon.stub(performance, 'now').returns(0)
     })
@@ -245,7 +289,6 @@ describe('Controller', () => {
     })
 
     describe('fileClicked', () => {
-        const filePath = 'myfile.js'
         async function createCodeGenState() {
             mockGetCodeGeneration = sinon.stub().resolves({ codeGenerationStatus: { status: 'Complete' } })
 
@@ -269,16 +312,7 @@ describe('Controller', () => {
             const codeGenState = new CodeGenState(
                 testConfig,
                 testApproach,
-                [
-                    {
-                        zipFilePath: 'myfile.js',
-                        relativePath: 'myfile.js',
-                        fileContent: '',
-                        rejected: false,
-                        virtualMemoryUri: '' as unknown as vscode.Uri,
-                        workspaceFolder: controllerSetup.workspaceFolder,
-                    },
-                ],
+                getFilePaths(controllerSetup),
                 [],
                 [],
                 tabID,
@@ -293,7 +327,12 @@ describe('Controller', () => {
             })
             return newSession
         }
-        async function fileClicked(getSessionStub: sinon.SinonStub<[tabID: string], Promise<Session>>, action: string) {
+
+        async function fileClicked(
+            getSessionStub: sinon.SinonStub<[tabID: string], Promise<Session>>,
+            action: string,
+            filePath: string
+        ) {
             controllerSetup.emitters.fileClicked.fire({
                 tabID,
                 conversationID,
@@ -307,20 +346,77 @@ describe('Controller', () => {
             }, {})
             return getSessionStub.getCall(0).returnValue
         }
+
         it('clicking the "Reject File" button updates the file state to "rejected: true"', async () => {
+            const filePath = getFilePaths(controllerSetup)[0].zipFilePath
             const session = await createCodeGenState()
             const getSessionStub = sinon.stub(controllerSetup.sessionStorage, 'getSession').resolves(session)
 
-            const rejectFile = await fileClicked(getSessionStub, 'reject-change')
+            const rejectFile = await fileClicked(getSessionStub, 'reject-change', filePath)
             assert.strictEqual(rejectFile.state.filePaths?.find(i => i.relativePath === filePath)?.rejected, true)
         })
+
         it('clicking the "Reject File" button and then "Revert Reject File", updates the file state to "rejected: false"', async () => {
+            const filePath = getFilePaths(controllerSetup)[0].zipFilePath
             const session = await createCodeGenState()
             const getSessionStub = sinon.stub(controllerSetup.sessionStorage, 'getSession').resolves(session)
 
-            await fileClicked(getSessionStub, 'reject-change')
-            const revertRejection = await fileClicked(getSessionStub, 'revert-rejection')
+            await fileClicked(getSessionStub, 'reject-change', filePath)
+            const revertRejection = await fileClicked(getSessionStub, 'revert-rejection', filePath)
             assert.strictEqual(revertRejection.state.filePaths?.find(i => i.relativePath === filePath)?.rejected, false)
         })
     })
+
+    describe('insertCode', () => {
+        it('sets the number of files accepted counting also deleted files', async () => {
+            async function insertCode() {
+                const initialState = new PrepareCodeGenState(
+                    {
+                        conversationId: conversationID,
+                        proxyClient: new FeatureDevClient(),
+                        workspaceRoots: [''],
+                        workspaceFolders: [controllerSetup.workspaceFolder],
+                        uploadId: uploadID,
+                    },
+                    '',
+                    getFilePaths(controllerSetup),
+                    getDeletedFiles(),
+                    [],
+                    tabID,
+                    0
+                )
+
+                const newSession = await createSession({
+                    messenger: controllerSetup.messenger,
+                    sessionState: initialState,
+                    conversationID,
+                    tabID,
+                    uploadID,
+                })
+                const getSessionStub = sinon.stub(controllerSetup.sessionStorage, 'getSession').resolves(newSession)
+
+                controllerSetup.emitters.followUpClicked.fire({
+                    tabID,
+                    conversationID,
+                    followUp: {
+                        type: FollowUpTypes.InsertCode,
+                    },
+                })
+
+                // Wait until the controller has time to process the event
+                await waitUntil(() => {
+                    return Promise.resolve(getSessionStub.callCount > 0)
+                }, {})
+            }
+
+            await insertCode()
+
+            assertTelemetry('amazonq_isAcceptedCodeChanges', {
+                amazonqConversationId: conversationID,
+                amazonqNumberOfFilesAccepted: 2,
+                enabled: true,
+                result: 'Succeeded',
+            })
+        })
+    })
 })