Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Remove data from Mongo on deactivation #1118

Merged
merged 2 commits into from
Oct 13, 2023
Merged

fix: Remove data from Mongo on deactivation #1118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f15da2
fix: Remove data from Mongo on deactivation
rjbrache Oct 12, 2023
f61cb42
Merge branch 'main' into mongofix
rjbrache Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/data/mongo/collections/device.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ describe('MongoDeviceTable', () => {
expect(collection.findOne).toHaveBeenCalledWith({ guid: 'someId', tenantId: 'someTenantId' })
})

it('should delete document by name and tenantId', async () => {
it('should delete document by guid and tenantId', async () => {
collection.deleteOne.mockResolvedValue({ deletedCount: 1 } as any)

const result = await mongoDeviceTable.delete('someName', 'someTenantId')
const result = await mongoDeviceTable.delete('someGuid', 'someTenantId')

expect(result).toBe(true)
expect(collection.deleteOne).toHaveBeenCalledWith({ friendlyName: 'someName', tenantId: 'someTenantId' })
expect(collection.deleteOne).toHaveBeenCalledWith({ guid: 'someGuid', tenantId: 'someTenantId' })
})

it('should insert a device', async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/data/mongo/collections/device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ export class MongoDeviceTable implements IDeviceTable {
return this.collection.findOne({ guid: id, tenantId }) as unknown as WithId<Device>
}

async delete (name: string, tenantId: string = ''): Promise<boolean> {
const result = await this.collection.deleteOne({ friendlyName: name, tenantId })
async delete (id: string, tenantId: string = ''): Promise<boolean> {
const result = await this.collection.deleteOne({ guid: id, tenantId })
return result.deletedCount && result.deletedCount > 0
}

Expand Down
Loading