🚧 progress(eid): Deduplicate insertions.

imports/api/collection/all.ts

@@ -1,6 +1,7 @@
 import type Collection from '../Collection';
 
 import {Settings} from './settings';
+import {Eids} from './eids';
 import {Patients} from './patients';
 import {PatientsSearchIndex} from './patients/search';
 import {Drugs} from './drugs';
@@ -16,6 +17,7 @@ import {Availability} from './availability';
 
 const collections: Array<Collection<any>> = [
 	Settings,
+	Eids,
 	Patients,
 	PatientsSearchIndex,
 	Drugs,

imports/api/collection/eids.ts

@@ -64,6 +64,7 @@ const eidMetadata = schema.object({
 	_id: schema.string(),
 	owner: schema.string(),
 	createdAt: schema.date(),
+	lastUsedAt: schema.date(),
 });
 
 export type EidMetadata = schema.infer<typeof eidMetadata>;

imports/api/endpoint/patients/insertFromEid.app-tests.ts

@@ -0,0 +1,31 @@
+import {assert} from 'chai';
+
+import {randomUserId, server} from '../../../_test/fixtures';
+
+import {Eids} from '../../collection/eids';
+
+import {newEidData} from '../../_dev/populate/eids';
+import invoke from '../invoke';
+
+import insertFromEid from './insertFromEid';
+
+server(__filename, () => {
+	it('does not create duplicate eid entries', async () => {
+		const userId = randomUserId();
+
+		const eid = newEidData();
+
+		await invoke(insertFromEid, {userId}, [eid]);
+		const oldEntry = await Eids.findOneAsync({owner: userId});
+		assert.isDefined(oldEntry);
+
+		await invoke(insertFromEid, {userId}, [eid]);
+		const entries = await Eids.find({owner: userId}).fetchAsync();
+
+		assert.strictEqual(entries.length, 1);
+
+		const {createdAt, lastUsedAt} = entries[0]!;
+		assert.strictEqual(createdAt.valueOf(), oldEntry.createdAt.valueOf());
+		assert.isAbove(lastUsedAt.valueOf(), oldEntry.lastUsedAt.valueOf());
+	});
+});

imports/api/endpoint/patients/insertFromEid.tests.ts

@@ -80,10 +80,11 @@ server(__filename, () => {
 
 		assert.strictEqual(entries.length, 1);
 
-		const {_id, createdAt, owner, ...rest} = entries[0]!;
+		const {_id, createdAt, lastUsedAt, owner, ...rest} = entries[0]!;
 
 		assert.strictEqual(owner, userId);
 		assert.isAtMost(createdAt.valueOf(), Date.now());
+		assert.strictEqual(lastUsedAt.valueOf(), createdAt.valueOf());
 
 		assert.deepEqual(
 			rest,

imports/api/endpoint/patients/insertFromEid.ts

@@ -17,11 +17,26 @@ export default define({
 	async transaction(db: TransactionDriver, eid) {
 		const owner = this.userId;
 
-		await db.insertOne(Eids, {
-			...eid,
-			createdAt: new Date(),
-			owner,
-		});
+		const lastUsedAt = new Date();
+
+		await db.updateOne(
+			Eids,
+			{
+				owner,
+				...eid,
+			},
+			{
+				$set: {
+					lastUsedAt,
+				},
+				$setOnInsert: {
+					createdAt: lastUsedAt,
+				},
+			},
+			{
+				upsert: true,
+			},
+		);
 
 		const patient = patientFieldsFromEid(eid);
 

imports/api/endpoint/patients/updateFromEid.app-tests.ts

@@ -0,0 +1,35 @@
+import {assert} from 'chai';
+
+import {randomUserId, server} from '../../../_test/fixtures';
+
+import {newPatient} from '../../_dev/populate/patients';
+import invoke from '../invoke';
+
+import {newEidData} from '../../_dev/populate/eids';
+
+import {Eids} from '../../collection/eids';
+
+import updateFromEid from './updateFromEid';
+
+server(__filename, () => {
+	it('does not create duplicate eid entries', async () => {
+		const userId = randomUserId();
+
+		const eid = newEidData();
+
+		const patientId = await newPatient({userId});
+
+		await invoke(updateFromEid, {userId}, [patientId, eid]);
+		const oldEntry = await Eids.findOneAsync({owner: userId});
+		assert.isDefined(oldEntry);
+
+		await invoke(updateFromEid, {userId}, [patientId, eid]);
+		const entries = await Eids.find({owner: userId}).fetchAsync();
+
+		assert.strictEqual(entries.length, 1);
+
+		const {createdAt, lastUsedAt} = entries[0]!;
+		assert.strictEqual(createdAt.valueOf(), oldEntry.createdAt.valueOf());
+		assert.isAbove(lastUsedAt.valueOf(), oldEntry.lastUsedAt.valueOf());
+	});
+});

imports/api/endpoint/patients/updateFromEid.tests.ts

@@ -162,10 +162,11 @@ server(__filename, () => {
 
 		assert.strictEqual(entries.length, 1);
 
-		const {_id, createdAt, owner, ...rest} = entries[0]!;
+		const {_id, createdAt, lastUsedAt, owner, ...rest} = entries[0]!;
 
 		assert.strictEqual(owner, userId);
 		assert.isAtMost(createdAt.valueOf(), Date.now());
+		assert.strictEqual(lastUsedAt.valueOf(), createdAt.valueOf());
 
 		assert.deepEqual(
 			rest,

imports/api/endpoint/patients/updateFromEid.ts

@@ -17,11 +17,26 @@ export default define({
 	async transaction(db: TransactionDriver, patientId, eid) {
 		const owner = this.userId;
 
-		await db.insertOne(Eids, {
-			...eid,
-			createdAt: new Date(),
-			owner,
-		});
+		const lastUsedAt = new Date();
+
+		await db.updateOne(
+			Eids,
+			{
+				owner,
+				...eid,
+			},
+			{
+				$set: {
+					lastUsedAt,
+				},
+				$setOnInsert: {
+					createdAt: lastUsedAt,
+				},
+			},
+			{
+				upsert: true,
+			},
+		);
 
 		const changes = patientFieldsFromEid(eid);
 

imports/migrations/versions/v1.ts

@@ -33,6 +33,7 @@ import {availability} from '../../api/availability';
 import {names} from '../../api/createTagCollection';
 import type TagDocument from '../../api/tags/TagDocument';
 import db from '../../backend/mongodb/db';
+import {Eids} from '../../api/collection/eids';
 
 export default async () => {
 	// Check that all ids are strings
@@ -313,6 +314,47 @@ export default async () => {
 	await createSimpleUniqueIndex(Allergies, 'name');
 	await createSimpleUniqueIndex(Books, 'name');
 
+	await Eids.rawCollection().createIndex(
+		{
+			owner: 1,
+			// NOTE: Those are the fields that are the most likely to change.
+			'card.cardnumber': 1,
+			'card.chipnumber': 1,
+			// NOTE: If the ones above match, usually the rest will match too.
+			'xml.encoding': 1,
+			'xml.version': 1,
+			'eid.graphpersoversion': 1,
+			'eid.version': 1,
+			'card.carddata_appl_version': 1,
+			'card.documenttype': 1,
+			'card.validitydatebegin': 1,
+			'card.validitydateend': 1,
+			'card.deliverymunicipality': 1,
+			'certificates.authentication': 1,
+			'certificates.citizenca': 1,
+			'certificates.root': 1,
+			'certificates.rrn': 1,
+			'certificates.signing': 1,
+			'identity.nationality': 1,
+			'identity.nationalnumber': 1,
+			'identity.dateofbirth': 1,
+			'identity.placeofbirth': 1,
+			'identity.gender': 1,
+			'identity.specialstatus': 1,
+			'identity.name': 1,
+			'identity.firstname': 1,
+			'identity.middlenames': 1,
+			'identity.photo': 1,
+			'address.municipality': 1,
+			'address.streetandnumber': 1,
+			'address.zip': 1,
+		},
+		{
+			unique: true,
+			background: true,
+		},
+	);
+
 	await Books.rawCollection().createIndex(
 		{
 			owner: 1,