Skip to content

Use mongo driver 4 rc #14

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

Closed
wants to merge 6 commits into from
Closed

Use mongo driver 4 rc #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6fe4aae
Use @bedrock/mongodb node driver 4 rc.
aljones15 Oct 27, 2022
1cd5dd1
Use record passed into insertOne over result.ops[0].
aljones15 Oct 27, 2022
ec96746
Replace mongo executionStatus n with modifiedCount + upsertedCount.
aljones15 Nov 11, 2022
24d11e3
Correct small typo in jsdoc string.
aljones15 Nov 11, 2022
ae454cf
Remove deprecated mongo index background.
aljones15 Jan 4, 2023
8f3e519
Add MAJOR CHANGELOG entry for mongodb upgrade.
aljones15 Jan 9, 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
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# bedrock-meter ChangeLog

## 6.0.0 -

### Changed
- **BREAKING**: Use `@bedrock/mongodb: ^11`.
- **BREAKING**: Change use of results to match Node Mongo Driver 4 API.

### Removed
- Remove deprecated MongoDB index `background`.

## 5.1.1 - 2022-11-16

### Fixed
Expand Down
13 changes: 8 additions & 5 deletions lib/meters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ bedrock.events.on('bedrock-mongodb.ready', async () => {
await database.createIndexes([{
collection: 'meter-meter',
fields: {'meter.id': 1},
options: {unique: true, background: false}
options: {unique: true}
}]);
});

Expand All @@ -47,7 +47,7 @@ export async function insert({meter} = {}) {
// store record
const now = Date.now();
const meta = {created: now, updated: now};
let record = {
const record = {
meter: {
...meter,
sequence: 0,
Expand All @@ -59,8 +59,7 @@ export async function insert({meter} = {}) {

try {
const collection = database.collections['meter-meter'];
const result = await collection.insertOne(record);
record = result.ops[0];
await collection.insertOne(record);
record.meter.id = meter.id;
} catch(e) {
if(!database.isDuplicateError(e)) {
Expand Down Expand Up @@ -119,7 +118,11 @@ export async function update({meter, explain = false} = {}) {

const result = await collection.updateOne(
query, {$set}, database.writeOptions);
if(result.result.n === 0) {
// in mongodb driver 4 or greater executionStats are replaced
// n previously counted the number of records that matched a query
// so we need the total of modified and upserted to track record change
const n = result.modifiedCount + result.upsertedCount;
if(n === 0) {
// no records changed...
throw new BedrockError(
'Could not update configuration. ' +
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"peerDependencies": {
"@bedrock/core": "^6.0.1",
"@bedrock/mongodb": "^10.0.0"
"@bedrock/mongodb": "^11.0.0"
},
"directories": {
"lib": "./lib"
Expand Down
2 changes: 1 addition & 1 deletion test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@bedrock/core": "^6.0.1",
"@bedrock/express": "^8.0.0",
"@bedrock/meter": "file:..",
"@bedrock/mongodb": "^10.0.0",
"@bedrock/mongodb": "github:digitalbazaar/bedrock-mongodb#mongo-driver-4-rc-fix-duplicate-error",
"@bedrock/server": "^5.0.0",
"@bedrock/test": "^8.0.5",
"bnid": "^3.0.0",
Expand Down