Hotfix/key thrown

src/file/file.model.ts

@@ -76,14 +76,39 @@ fileSchema.virtual('fullExtension')
   });
 
 // handleE11000 is called when there is a duplicateKey Error
-const handleE11000 = function (error: MongoError, _: any, next: NextFunction) {
+const handleE11000 = function (error: MongoError, _: any, next: NextFunction) : void {
   if (error.name === 'MongoError' && error.code === 11000) {
-    next(new KeyAlreadyExistsError(this.key));
+    const retMessage : string = getMongoErrorIndices(error);
+    next(new KeyAlreadyExistsError(retMessage));
   } else {
     next();
   }
 };
 
+/**
+ * Extracts the indices names and values thrown by the duplicate key error.
+ * @param error - the mongo error thrown.
+ * @return string with the index names and values.
+ */
+function getMongoErrorIndices(error: MongoError) : string {
+  // extract the indices names in the MongoError
+  const indicesRegex : RegExp = new RegExp(/index\:\ (?:.*\.)?\$?(?:([_a-z0-9]*)(?:_\d*)|([_a-z0-9]*))\s*dup key/i);
+  const indicesMatch : RegExpMatchArray =  error.message.match(indicesRegex);
+  let indexName : string = indicesMatch[1] || indicesMatch[2];
+
+  // prettify indices names
+  const re : RegExp = new RegExp('_1_', 'g');
+  indexName = indexName.replace(re, ', ');
+
+  // extract the indices values of the error thrown
+  const valuesRE : RegExp = new RegExp(/{(.*?)}/);
+  const valuesMatch : RegExpMatchArray = error.message.match(valuesRE);
+  let values : string = valuesMatch[0];
+  values = values.replace(new RegExp(' : ', 'g'), ' ');
+
+  return `${indexName} : ${values}`;
+}
+
 fileSchema.post('save', handleE11000);
 fileSchema.post('update', handleE11000);
 fileSchema.post('findOneAndUpdate', handleE11000);

src/file/file.repository.ts

@@ -37,7 +37,7 @@ export default class FileRepository {
   }
 
   /**
-   * Changes 'deleted' flag to true. Does not delete from th DB.
+   * Deletes a file from the DB.
    * @param id - the id of the file to be deleted.
    */
   static deleteById(id: string): Promise<IFile | null> {

src/file/file.service.spec.ts

@@ -357,14 +357,37 @@ describe('File Logic', () => {
       expect(file2.parent).to.equal(file1.parent);
     });
 
-    it('should throw an error when KEY already exist', async () => {
+    it('should throw an error when KEY already exists', async () => {
       await FileService.create(bucket, 'tmp1', USER.id, 'text', null, KEY);
       await FileService.create(bucket, 'tmp2', USER.id, 'text', null, KEY)
       .should.eventually.be.rejectedWith(KeyAlreadyExistsError);
     });
 
   });
 
+  describe('#updateById', () => {
+    it('should update a file', async () => {
+      const file: IFile = await FileService.create(bucket, 'file.txt', USER.id, 'text', KEY2, KEY, size);
+      await FileService.updateById(file.id, { name: 'changedFile', type: 'jpg' });
+      const changedFile : IFile = await FileService.getById(file.id);
+      expect(changedFile.name).to.equal('changedFile');
+      expect(changedFile.type).to.equal('jpg');
+    });
+
+    it('should throw an error when changing a file to unique properties of another (trinity)', async () => {
+      const file1: IFile = await FileService.create(bucket, 'file1.txt', USER.id, 'text', null, KEY);
+      const file2: IFile = await FileService.create(bucket, 'file2.txt', USER.id, 'text', null, KEY2);
+      await FileService.updateById(file1.id, { name: 'file2.txt' }).should.eventually.be.rejectedWith(KeyAlreadyExistsError);
+    });
+
+    it('should throw an error when changing a file to unique properties of another (key)', async () => {
+      const file1: IFile = await FileService.create(bucket, 'file1.txt', USER.id, 'text', null, KEY);
+      const file2: IFile = await FileService.create(bucket, 'file2.txt', USER.id, 'text', null, KEY2);
+      await FileService.updateById(file1.id, { key: KEY2 }).should.eventually.be.rejectedWith(KeyAlreadyExistsError);
+    });
+
+  });
+
   describe('#getByID', () => {
     it('should get an error when file does not exist', async () => {
       await FileService.getByKey(KEY).should.eventually.be.rejectedWith(FileNotFoundError);

src/file/file.service.ts

@@ -58,7 +58,6 @@ export class FileService {
       ownerID,
       size,
       _id: id,
-      deleted: false,
       parent: parentID,
     });
 

src/utils/errors/client.error.ts

@@ -21,7 +21,7 @@ export class MailInvalidError extends ClientError {
 
 export class KeyAlreadyExistsError extends ClientError {
   constructor(key:string, message?: string) {
-    super(message || `key: ${key} is already in use`, grpc.status.INVALID_ARGUMENT);
+    super(message || `unique key '${key}' is already in use`, grpc.status.INVALID_ARGUMENT);
   }
 }