@webiny/api-file-manager-ddb 0.0.0-unstable.d7f521b032 → 0.0.0-unstable.ecd8734205

package/definitions/settingsEntity.js

@@ -1,52 +1,38 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _dynamodbToolbox = require("dynamodb-toolbox");
-
-var _attributes = require("@webiny/db-dynamodb/utils/attributes");
-
 var _default = params => {
   const {
-    context,
     table
   } = params;
-  const entityName = "Settings";
-  const attributes = (0, _attributes.getExtraAttributes)(context, entityName);
+  const entityName = "FM.Settings";
   return new _dynamodbToolbox.Entity({
     name: entityName,
     table,
-    attributes: (0, _objectSpread2.default)({
+    attributes: {
       PK: {
         partitionKey: true
       },
       SK: {
         sortKey: true
       },
-      TYPE: {
+      GSI1_PK: {
         type: "string"
       },
-      key: {
+      GSI1_SK: {
         type: "string"
       },
-      uploadMinFileSize: {
-        type: "number"
-      },
-      uploadMaxFileSize: {
-        type: "number"
-      },
-      srcPrefix: {
+      TYPE: {
         type: "string"
+      },
+      data: {
+        type: "map"
       }
-    }, attributes)
+    }
   });
 };
-
 exports.default = _default;

package/definitions/settingsEntity.js.map

@@ -1 +1 @@
-{"version":3,"names":["params","context","table","entityName","attributes","getExtraAttributes","Entity","name","PK","partitionKey","SK","sortKey","TYPE","type","key","uploadMinFileSize","uploadMaxFileSize","srcPrefix"],"sources":["settingsEntity.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { FileManagerContext } from \"@webiny/api-file-manager/types\";\nimport { getExtraAttributes } from \"@webiny/db-dynamodb/utils/attributes\";\n\nexport interface SettingsEntityParams {\n    context: FileManagerContext;\n    table: Table;\n}\nexport default (params: SettingsEntityParams): Entity<any> => {\n    const { context, table } = params;\n    const entityName = \"Settings\";\n    const attributes = getExtraAttributes(context, entityName);\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            TYPE: {\n                type: \"string\"\n            },\n            key: {\n                type: \"string\"\n            },\n            uploadMinFileSize: {\n                type: \"number\"\n            },\n            uploadMaxFileSize: {\n                type: \"number\"\n            },\n            srcPrefix: {\n                type: \"string\"\n            },\n            ...attributes\n        }\n    });\n};\n"],"mappings":";;;;;;;;;;;AAAA;;AAEA;;eAMgBA,MAAD,IAA+C;EAC1D,MAAM;IAAEC,OAAF;IAAWC;EAAX,IAAqBF,MAA3B;EACA,MAAMG,UAAU,GAAG,UAAnB;EACA,MAAMC,UAAU,GAAG,IAAAC,8BAAA,EAAmBJ,OAAnB,EAA4BE,UAA5B,CAAnB;EACA,OAAO,IAAIG,uBAAJ,CAAW;IACdC,IAAI,EAAEJ,UADQ;IAEdD,KAFc;IAGdE,UAAU;MACNI,EAAE,EAAE;QACAC,YAAY,EAAE;MADd,CADE;MAINC,EAAE,EAAE;QACAC,OAAO,EAAE;MADT,CAJE;MAONC,IAAI,EAAE;QACFC,IAAI,EAAE;MADJ,CAPA;MAUNC,GAAG,EAAE;QACDD,IAAI,EAAE;MADL,CAVC;MAaNE,iBAAiB,EAAE;QACfF,IAAI,EAAE;MADS,CAbb;MAgBNG,iBAAiB,EAAE;QACfH,IAAI,EAAE;MADS,CAhBb;MAmBNI,SAAS,EAAE;QACPJ,IAAI,EAAE;MADC;IAnBL,GAsBHT,UAtBG;EAHI,CAAX,CAAP;AA4BH,C"}
+{"version":3,"names":["params","table","entityName","Entity","name","attributes","PK","partitionKey","SK","sortKey","GSI1_PK","type","GSI1_SK","TYPE","data"],"sources":["settingsEntity.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { FileManagerContext } from \"@webiny/api-file-manager/types\";\n\nexport interface SettingsEntityParams {\n    context: FileManagerContext;\n    table: Table;\n}\nexport default (params: SettingsEntityParams): Entity<any> => {\n    const { table } = params;\n    const entityName = \"FM.Settings\";\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            GSI1_PK: {\n                type: \"string\"\n            },\n            GSI1_SK: {\n                type: \"string\"\n            },\n            TYPE: {\n                type: \"string\"\n            },\n            data: {\n                type: \"map\"\n            }\n        }\n    });\n};\n"],"mappings":";;;;;;AAAA;AAAiD,eAOjCA,MAA4B,IAAkB;EAC1D,MAAM;IAAEC;EAAM,CAAC,GAAGD,MAAM;EACxB,MAAME,UAAU,GAAG,aAAa;EAChC,OAAO,IAAIC,uBAAM,CAAC;IACdC,IAAI,EAAEF,UAAU;IAChBD,KAAK;IACLI,UAAU,EAAE;MACRC,EAAE,EAAE;QACAC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAC,OAAO,EAAE;MACb,CAAC;MACDC,OAAO,EAAE;QACLC,IAAI,EAAE;MACV,CAAC;MACDC,OAAO,EAAE;QACLD,IAAI,EAAE;MACV,CAAC;MACDE,IAAI,EAAE;QACFF,IAAI,EAAE;MACV,CAAC;MACDG,IAAI,EAAE;QACFH,IAAI,EAAE;MACV;IACJ;EACJ,CAAC,CAAC;AACN,CAAC;AAAA"}

package/definitions/systemEntity.js

@@ -1,18 +1,13 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _dynamodbToolbox = require("dynamodb-toolbox");
-
 var _attributes = require("@webiny/db-dynamodb/utils/attributes");
-
 var _default = params => {
   const {
     context,
@@ -39,5 +34,4 @@ var _default = params => {
     }, attributes)
   });
 };
-
 exports.default = _default;

package/definitions/systemEntity.js.map

@@ -1 +1 @@
-{"version":3,"names":["params","context","table","entityName","attributes","getExtraAttributes","Entity","name","PK","partitionKey","SK","sortKey","version","type","tenant"],"sources":["systemEntity.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { FileManagerContext } from \"@webiny/api-file-manager/types\";\nimport { getExtraAttributes } from \"@webiny/db-dynamodb/utils/attributes\";\n\nexport interface SystemEntityParams {\n    context: FileManagerContext;\n    table: Table;\n}\nexport default (params: SystemEntityParams): Entity<any> => {\n    const { context, table } = params;\n    const entityName = \"System\";\n    const attributes = getExtraAttributes(context, entityName);\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            version: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\"\n            },\n            ...attributes\n        }\n    });\n};\n"],"mappings":";;;;;;;;;;;AAAA;;AAEA;;eAMgBA,MAAD,IAA6C;EACxD,MAAM;IAAEC,OAAF;IAAWC;EAAX,IAAqBF,MAA3B;EACA,MAAMG,UAAU,GAAG,QAAnB;EACA,MAAMC,UAAU,GAAG,IAAAC,8BAAA,EAAmBJ,OAAnB,EAA4BE,UAA5B,CAAnB;EACA,OAAO,IAAIG,uBAAJ,CAAW;IACdC,IAAI,EAAEJ,UADQ;IAEdD,KAFc;IAGdE,UAAU;MACNI,EAAE,EAAE;QACAC,YAAY,EAAE;MADd,CADE;MAINC,EAAE,EAAE;QACAC,OAAO,EAAE;MADT,CAJE;MAONC,OAAO,EAAE;QACLC,IAAI,EAAE;MADD,CAPH;MAUNC,MAAM,EAAE;QACJD,IAAI,EAAE;MADF;IAVF,GAaHT,UAbG;EAHI,CAAX,CAAP;AAmBH,C"}
+{"version":3,"names":["params","context","table","entityName","attributes","getExtraAttributes","Entity","name","PK","partitionKey","SK","sortKey","version","type","tenant"],"sources":["systemEntity.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { FileManagerContext } from \"@webiny/api-file-manager/types\";\nimport { getExtraAttributes } from \"@webiny/db-dynamodb/utils/attributes\";\n\nexport interface SystemEntityParams {\n    context: FileManagerContext;\n    table: Table;\n}\nexport default (params: SystemEntityParams): Entity<any> => {\n    const { context, table } = params;\n    const entityName = \"System\";\n    const attributes = getExtraAttributes(context, entityName);\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            version: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\"\n            },\n            ...attributes\n        }\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AAEA;AAA0E,eAM1DA,MAA0B,IAAkB;EACxD,MAAM;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGF,MAAM;EACjC,MAAMG,UAAU,GAAG,QAAQ;EAC3B,MAAMC,UAAU,GAAG,IAAAC,8BAAkB,EAACJ,OAAO,EAAEE,UAAU,CAAC;EAC1D,OAAO,IAAIG,uBAAM,CAAC;IACdC,IAAI,EAAEJ,UAAU;IAChBD,KAAK;IACLE,UAAU;MACNI,EAAE,EAAE;QACAC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAC,OAAO,EAAE;MACb,CAAC;MACDC,OAAO,EAAE;QACLC,IAAI,EAAE;MACV,CAAC;MACDC,MAAM,EAAE;QACJD,IAAI,EAAE;MACV;IAAC,GACET,UAAU;EAErB,CAAC,CAAC;AACN,CAAC;AAAA"}

package/definitions/table.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _dynamodbToolbox = require("dynamodb-toolbox");
-
 var _utils = require("../operations/utils");
-
 var _default = params => {
   const {
     context
@@ -17,8 +14,13 @@ var _default = params => {
     name: process.env.DB_TABLE_FILE_MANGER || process.env.DB_TABLE || (0, _utils.getTable)(context),
     partitionKey: "PK",
     sortKey: "SK",
-    DocumentClient: (0, _utils.getDocumentClient)(context)
+    DocumentClient: (0, _utils.getDocumentClient)(context),
+    indexes: {
+      GSI1: {
+        partitionKey: "GSI1_PK",
+        sortKey: "GSI1_SK"
+      }
+    }
   });
 };
-
 exports.default = _default;

package/definitions/table.js.map

@@ -1 +1 @@
-{"version":3,"names":["params","context","Table","name","process","env","DB_TABLE_FILE_MANGER","DB_TABLE","getTable","partitionKey","sortKey","DocumentClient","getDocumentClient"],"sources":["table.ts"],"sourcesContent":["import { Table } from \"dynamodb-toolbox\";\nimport { getDocumentClient, getTable } from \"~/operations/utils\";\nimport { FileManagerContext } from \"@webiny/api-file-manager/types\";\n\nexport interface TableParams {\n    context: FileManagerContext;\n}\nexport default (params: TableParams): Table => {\n    const { context } = params;\n    return new Table({\n        name: process.env.DB_TABLE_FILE_MANGER || process.env.DB_TABLE || getTable(context),\n        partitionKey: \"PK\",\n        sortKey: \"SK\",\n        DocumentClient: getDocumentClient(context)\n    });\n};\n"],"mappings":";;;;;;;AAAA;;AACA;;eAMgBA,MAAD,IAAgC;EAC3C,MAAM;IAAEC;EAAF,IAAcD,MAApB;EACA,OAAO,IAAIE,sBAAJ,CAAU;IACbC,IAAI,EAAEC,OAAO,CAACC,GAAR,CAAYC,oBAAZ,IAAoCF,OAAO,CAACC,GAAR,CAAYE,QAAhD,IAA4D,IAAAC,eAAA,EAASP,OAAT,CADrD;IAEbQ,YAAY,EAAE,IAFD;IAGbC,OAAO,EAAE,IAHI;IAIbC,cAAc,EAAE,IAAAC,wBAAA,EAAkBX,OAAlB;EAJH,CAAV,CAAP;AAMH,C"}
+{"version":3,"names":["params","context","Table","name","process","env","DB_TABLE_FILE_MANGER","DB_TABLE","getTable","partitionKey","sortKey","DocumentClient","getDocumentClient","indexes","GSI1"],"sources":["table.ts"],"sourcesContent":["import { Table } from \"dynamodb-toolbox\";\nimport { getDocumentClient, getTable } from \"~/operations/utils\";\nimport { FileManagerContext } from \"@webiny/api-file-manager/types\";\n\nexport interface TableParams {\n    context: FileManagerContext;\n}\nexport default (params: TableParams): Table => {\n    const { context } = params;\n    return new Table({\n        name: process.env.DB_TABLE_FILE_MANGER || process.env.DB_TABLE || getTable(context),\n        partitionKey: \"PK\",\n        sortKey: \"SK\",\n        DocumentClient: getDocumentClient(context),\n        indexes: {\n            GSI1: {\n                partitionKey: \"GSI1_PK\",\n                sortKey: \"GSI1_SK\"\n            }\n        }\n    });\n};\n"],"mappings":";;;;;;AAAA;AACA;AAAiE,eAMjDA,MAAmB,IAAY;EAC3C,MAAM;IAAEC;EAAQ,CAAC,GAAGD,MAAM;EAC1B,OAAO,IAAIE,sBAAK,CAAC;IACbC,IAAI,EAAEC,OAAO,CAACC,GAAG,CAACC,oBAAoB,IAAIF,OAAO,CAACC,GAAG,CAACE,QAAQ,IAAI,IAAAC,eAAQ,EAACP,OAAO,CAAC;IACnFQ,YAAY,EAAE,IAAI;IAClBC,OAAO,EAAE,IAAI;IACbC,cAAc,EAAE,IAAAC,wBAAiB,EAACX,OAAO,CAAC;IAC1CY,OAAO,EAAE;MACLC,IAAI,EAAE;QACFL,YAAY,EAAE,SAAS;QACvBC,OAAO,EAAE;MACb;IACJ;EACJ,CAAC,CAAC;AACN,CAAC;AAAA"}

package/index.js

@@ -4,13 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _files = require("./operations/files");
-
 var _settings = require("./operations/settings");
-
 var _system = require("./operations/system");
-
 var _default = () => [new _files.FilesStorageOperationsProviderDdb(), new _settings.SettingsStorageOperationsProviderDdbPlugin(), new _system.SystemStorageOperationsProviderDdbPlugin()];
-
 exports.default = _default;

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["FilesStorageOperationsProviderDdb","SettingsStorageOperationsProviderDdbPlugin","SystemStorageOperationsProviderDdbPlugin"],"sources":["index.ts"],"sourcesContent":["import { FilesStorageOperationsProviderDdb } from \"./operations/files\";\nimport { SettingsStorageOperationsProviderDdbPlugin } from \"./operations/settings\";\nimport { SystemStorageOperationsProviderDdbPlugin } from \"./operations/system\";\n\nexport default () => [\n    new FilesStorageOperationsProviderDdb(),\n    new SettingsStorageOperationsProviderDdbPlugin(),\n    new SystemStorageOperationsProviderDdbPlugin()\n];\n"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;eAEe,MAAM,CACjB,IAAIA,wCAAJ,EADiB,EAEjB,IAAIC,oDAAJ,EAFiB,EAGjB,IAAIC,gDAAJ,EAHiB,C"}
+{"version":3,"names":["FilesStorageOperationsProviderDdb","SettingsStorageOperationsProviderDdbPlugin","SystemStorageOperationsProviderDdbPlugin"],"sources":["index.ts"],"sourcesContent":["import { FilesStorageOperationsProviderDdb } from \"./operations/files\";\nimport { SettingsStorageOperationsProviderDdbPlugin } from \"./operations/settings\";\nimport { SystemStorageOperationsProviderDdbPlugin } from \"./operations/system\";\n\nexport default () => [\n    new FilesStorageOperationsProviderDdb(),\n    new SettingsStorageOperationsProviderDdbPlugin(),\n    new SystemStorageOperationsProviderDdbPlugin()\n];\n"],"mappings":";;;;;;AAAA;AACA;AACA;AAA+E,eAEhE,MAAM,CACjB,IAAIA,wCAAiC,EAAE,EACvC,IAAIC,oDAA0C,EAAE,EAChD,IAAIC,gDAAwC,EAAE,CACjD;AAAA"}

package/operations/files/FilesStorageOperations.d.ts

@@ -5,7 +5,8 @@ interface ConstructorParams {
 export declare class FilesStorageOperations implements FileManagerFilesStorageOperations {
     private readonly _context;
     private readonly table;
-    private readonly entity;
+    private readonly fileEntity;
+    private readonly aliasEntity;
     private get context();
     constructor({ context }: ConstructorParams);
     get(params: FileManagerFilesStorageOperationsGetParams): Promise<File | null>;
@@ -17,6 +18,7 @@ export declare class FilesStorageOperations implements FileManagerFilesStorageOp
     tags(params: FileManagerFilesStorageOperationsTagsParams): Promise<FileManagerFilesStorageOperationsTagsResponse>;
     private createQueryAllOptions;
     private createPartitionKey;
-    private createSortKey;
+    private createGSI1PartitionKey;
+    private createNewAliasesRecords;
 }
 export {};

package/operations/files/FilesStorageOperations.js

@@ -1,74 +1,54 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FilesStorageOperations = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _table = _interopRequireDefault(require("../../definitions/table"));
-
-var _filesEntity = _interopRequireDefault(require("../../definitions/filesEntity"));
-
 var _query = require("@webiny/db-dynamodb/utils/query");
-
 var _cursor = require("@webiny/db-dynamodb/utils/cursor");
-
 var _filter = require("@webiny/db-dynamodb/utils/filter");
-
 var _sort = require("@webiny/db-dynamodb/utils/sort");
-
 var _FileDynamoDbFieldPlugin = require("../../plugins/FileDynamoDbFieldPlugin");
-
 var _batchWrite = require("@webiny/db-dynamodb/utils/batchWrite");
-
 var _get = require("@webiny/db-dynamodb/utils/get");
-
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-
+var _dbDynamodb = require("@webiny/db-dynamodb");
 class FilesStorageOperations {
   get context() {
     return this._context;
   }
-
   constructor({
     context
   }) {
     (0, _defineProperty2.default)(this, "_context", void 0);
     (0, _defineProperty2.default)(this, "table", void 0);
-    (0, _defineProperty2.default)(this, "entity", void 0);
+    (0, _defineProperty2.default)(this, "fileEntity", void 0);
+    (0, _defineProperty2.default)(this, "aliasEntity", void 0);
     this._context = context;
     this.table = (0, _table.default)({
       context
     });
-    this.entity = (0, _filesEntity.default)({
-      context,
-      table: this.table
-    });
+    this.fileEntity = (0, _dbDynamodb.createStandardEntity)(this.table, "FM.File");
+    this.aliasEntity = (0, _dbDynamodb.createStandardEntity)(this.table, "FM.FileAlias");
   }
-
   async get(params) {
     const {
       where
     } = params;
     const keys = {
       PK: this.createPartitionKey(where),
-      SK: this.createSortKey(where)
+      SK: "A"
     };
-
     try {
       const file = await (0, _get.get)({
-        entity: this.entity,
+        entity: this.fileEntity,
         keys
       });
-      return (0, _cleanup.cleanupItem)(this.entity, file);
+      return file ? file.data : null;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not fetch requested file.", ex.code || "GET_FILE_ERROR", {
         error: ex,
@@ -76,90 +56,150 @@ class FilesStorageOperations {
       });
     }
   }
-
   async create(params) {
     const {
       file
     } = params;
-    const keys = {
+    const items = [];
+    const item = {
       PK: this.createPartitionKey(file),
-      SK: this.createSortKey(file)
+      SK: "A",
+      GSI1_PK: this.createGSI1PartitionKey(file),
+      GSI1_SK: file.id,
+      TYPE: "fm.file",
+      data: file
     };
-    const item = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, file), keys), {}, {
-      TYPE: "fm.file"
+    items.push(this.fileEntity.putBatch(item));
+    this.createNewAliasesRecords(file).forEach(alias => {
+      items.push(this.aliasEntity.putBatch(alias));
     });
-
     try {
-      await this.entity.put(item);
+      await (0, _batchWrite.batchWriteAll)({
+        table: this.table,
+        items
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not create a new file in the DynamoDB.", ex.code || "CREATE_FILE_ERROR", {
         error: ex,
-        item
+        items
       });
     }
-
     return file;
   }
-
   async update(params) {
     const {
       file
     } = params;
-    const keys = {
+    const items = [];
+    const item = {
       PK: this.createPartitionKey(file),
-      SK: this.createSortKey(file)
+      SK: "A",
+      GSI1_PK: this.createGSI1PartitionKey(file),
+      GSI1_SK: file.id,
+      TYPE: "fm.file",
+      data: file
     };
-    const item = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, file), keys), {}, {
-      TYPE: "fm.file"
+    items.push(this.fileEntity.putBatch(item));
+    const existingAliases = await (0, _query.queryAll)({
+      entity: this.aliasEntity,
+      partitionKey: `T#${file.tenant}#L#${file.locale}#FM#FILE#${file.id}`,
+      options: {
+        beginsWith: `ALIAS#`
+      }
+    });
+    const newAliases = this.createNewAliasesRecords(file, existingAliases.map(alias => alias.data));
+    newAliases.forEach(alias => {
+      items.push(this.aliasEntity.putBatch(alias));
     });
 
+    // Delete aliases that are in the DB but are NOT in the file.
+    for (const {
+      data
+    } of existingAliases) {
+      if (!file.aliases.some(alias => data.alias === alias)) {
+        items.push(this.aliasEntity.deleteBatch({
+          PK: this.createPartitionKey(file),
+          SK: `ALIAS#${data.alias}`
+        }));
+      }
+    }
     try {
-      await this.entity.put(item);
+      await (0, _batchWrite.batchWriteAll)({
+        table: this.table,
+        items
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not update a file in the DynamoDB.", ex.code || "UPDATE_FILE_ERROR", {
-        error: ex,
-        item
+        items
       });
     }
-
-    return file;
+    return params.file;
   }
-
   async delete(params) {
     const {
       file
     } = params;
     const keys = {
       PK: this.createPartitionKey(file),
-      SK: this.createSortKey(file)
+      SK: "A"
     };
+    const aliasItems = await (0, _query.queryAll)({
+      entity: this.aliasEntity,
+      partitionKey: keys.PK,
+      options: {
+        beginsWith: "ALIAS#"
+      }
+    });
 
+    // All items to delete in batch
+    const items = [];
     try {
-      await this.entity.delete(keys);
+      // Delete the main file item
+      items.push(this.fileEntity.deleteBatch(keys));
+
+      // Delete file alias items
+      aliasItems.forEach(item => {
+        items.push(this.aliasEntity.deleteBatch({
+          PK: item.PK,
+          SK: item.SK
+        }));
+      });
+      await (0, _batchWrite.batchWriteAll)({
+        table: this.table,
+        items
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not delete file from the DynamoDB.", ex.code || "DELETE_FILE_ERROR", {
         error: ex,
         file,
-        keys
+        keys,
+        aliasItems
       });
     }
   }
-
   async createBatch(params) {
     const {
       files
     } = params;
-    const items = files.map(file => {
-      return this.entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, file), {}, {
+
+    // Items to be written in batch
+    const items = [];
+    files.forEach(file => {
+      items.push(this.fileEntity.putBatch({
         PK: this.createPartitionKey(file),
-        SK: this.createSortKey(file),
-        TYPE: "fm.file"
+        SK: "A",
+        GSI1_PK: this.createGSI1PartitionKey(file),
+        GSI1_SK: file.id,
+        TYPE: "fm.file",
+        data: file
       }));
+      this.createNewAliasesRecords(file).forEach(alias => {
+        items.push(this.aliasEntity.putBatch(alias));
+      });
     });
-
     try {
       await (0, _batchWrite.batchWriteAll)({
-        table: this.entity.table,
+        table: this.table,
         items
       });
     } catch (ex) {
@@ -168,10 +208,8 @@ class FilesStorageOperations {
         files
       });
     }
-
     return files;
   }
-
   async list(params) {
     const {
       where: initialWhere,
@@ -183,14 +221,14 @@ class FilesStorageOperations {
       where: initialWhere
     });
     const queryAllParams = {
-      entity: this.entity,
-      partitionKey: this.createPartitionKey(initialWhere),
+      entity: this.fileEntity,
+      partitionKey: this.createGSI1PartitionKey(initialWhere),
       options
     };
     let items = [];
-
     try {
-      items = await (0, _query.queryAll)(queryAllParams);
+      const dbItems = await (0, _query.queryAll)(queryAllParams);
+      items = dbItems.map(item => item.data);
     } catch (ex) {
       throw new _error.default(ex.message || "Could not query for the files.", ex.code || "FILE_LIST_ERROR", {
         error: ex,
@@ -206,16 +244,13 @@ class FilesStorageOperations {
         }
       });
     }
-
     const where = (0, _objectSpread2.default)({}, initialWhere);
-
     if (where.search) {
       where.contains = {
         fields: ["name", "tags"],
         value: where.search
       };
     }
-
     delete where["tenant"];
     delete where["locale"];
     delete where["search"];
@@ -224,7 +259,6 @@ class FilesStorageOperations {
      * Filter the read items via the code.
      * It will build the filters out of the where input and transform the values it is using.
      */
-
     const filteredFiles = (0, _filter.filterItems)({
       plugins: this.context.plugins,
       items,
@@ -236,7 +270,6 @@ class FilesStorageOperations {
      * Sorting is also done via the code.
      * It takes the sort input and sorts by it via the lodash sortBy method.
      */
-
     const sortedFiles = (0, _sort.sortItems)({
       items: filteredFiles,
       sort,
@@ -250,7 +283,6 @@ class FilesStorageOperations {
      * Although we do not need a cursor here, we will use it as such to keep it standardized.
      * Number is simply encoded.
      */
-
     const cursor = files.length > 0 ? (0, _cursor.encodeCursor)(start + limit) : null;
     const meta = {
       hasMoreItems,
@@ -259,60 +291,56 @@ class FilesStorageOperations {
     };
     return [files, meta];
   }
-
   async tags(params) {
     const {
       where: initialWhere
     } = params;
     const queryAllParams = {
-      entity: this.entity,
-      partitionKey: this.createPartitionKey(initialWhere),
+      entity: this.fileEntity,
+      partitionKey: this.createGSI1PartitionKey(initialWhere),
       options: {
+        index: "GSI1",
         gte: " ",
         reverse: false
       }
     };
     let results = [];
-
     try {
-      results = await (0, _query.queryAll)(queryAllParams);
+      const dbItems = await (0, _query.queryAll)(queryAllParams);
+      results = dbItems.map(item => item.data);
     } catch (ex) {
       throw new _error.default(ex.message || "Error in the DynamoDB query.", ex.code || "DYNAMODB_ERROR", {
         error: ex,
         query: queryAllParams
       });
     }
-
     const fields = this.context.plugins.byType(_FileDynamoDbFieldPlugin.FileDynamoDbFieldPlugin.type);
     const where = (0, _objectSpread2.default)({}, initialWhere);
     delete where["tenant"];
     delete where["locale"];
+
     /**
      * Filter the read items via the code.
      * It will build the filters out of the where input and transform the values it is using.
      */
-
     const filteredItems = (0, _filter.filterItems)({
       plugins: this.context.plugins,
       items: results,
       where,
       fields
     });
+
     /**
      * Aggregate all the tags from all the filtered items.
      */
-
     const tagsObject = filteredItems.reduce((collection, item) => {
       const tags = Array.isArray(item.tags) ? item.tags : [];
-
       for (const tag of tags) {
         if (!collection[tag]) {
           collection[tag] = [];
         }
-
         collection[tag].push(item.id);
       }
-
       return collection;
     }, {});
     const tags = Object.keys(tagsObject);
@@ -325,34 +353,57 @@ class FilesStorageOperations {
     };
     return [tags, meta];
   }
-
   createQueryAllOptions({
     where
   }) {
-    const options = {};
-
+    const options = {
+      index: "GSI1"
+    };
     if (where.id) {
       options.eq = where.id;
+    } else {
+      options.gt = " ";
     }
-
     return options;
   }
-
   createPartitionKey(params) {
     const {
       tenant,
-      locale
+      locale,
+      id
     } = params;
-    return `T#${tenant}#L#${locale}#FM#F`;
+    return `T#${tenant}#L#${locale}#FM#FILE#${id}`;
   }
-
-  createSortKey(params) {
+  createGSI1PartitionKey(params) {
     const {
-      id
+      tenant,
+      locale
     } = params;
-    return id;
+    return `T#${tenant}#L#${locale}#FM#FILES`;
   }
+  createNewAliasesRecords(file, existingAliases = []) {
+    return (file.aliases || []).map(alias => {
+      // If alias is already in the DB, skip it.
+      if (existingAliases.find(item => item.alias === alias)) {
+        return null;
+      }
 
+      // Add a new alias.
+      return {
+        PK: this.createPartitionKey(file),
+        SK: `ALIAS#${alias}`,
+        GSI1_PK: `T#${file.tenant}#FM#FILE_ALIASES`,
+        GSI1_SK: alias,
+        TYPE: "fm.fileAlias",
+        data: {
+          alias,
+          tenant: file.tenant,
+          locale: file.locale,
+          fileId: file.id,
+          key: file.key
+        }
+      };
+    }).filter(Boolean);
+  }
 }
-
 exports.FilesStorageOperations = FilesStorageOperations;