Added parsing for getItemById request URL

microsoft · Dec 14, 2017 · 0fab7db · 0fab7db
1 parent cacf2de
commit 0fab7db
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/bundle/lib/entity/entity.config.d.ts b/bundle/lib/entity/entity.config.d.ts
@@ -13,6 +13,7 @@ export declare class ModelEntity extends EntityConfigBase {
     parseDataQuery?: (dataQuery: DataQuery) => {
         [index: string]: any;
     };
+    parseItemQuery?: (itemId: string | number, entity?: ModelEntity, config?: ParisConfig) => string;
     constructor(config: EntityConfig, entityConstructor: DataEntityConstructor<any>);
 }
 export interface EntityConfig extends IEntityConfigBase {
@@ -26,6 +27,7 @@ export interface EntityConfig extends IEntityConfigBase {
     parseDataQuery?: (dataQuery: DataQuery) => {
         [index: string]: any;
     };
+    parseItemQuery?: (itemId: string | number, entity?: ModelEntity, config?: ParisConfig) => string;
 }
 export interface ModelEntityCacheConfig {
     time?: number;

diff --git a/bundle/lib/repository/repository.d.ts b/bundle/lib/repository/repository.d.ts
@@ -49,7 +49,9 @@ export declare class Repository<T extends EntityModelBase> implements IRepositor
     private static getEntityItem<U>(repository, data, options?);
     private static getValueObjectItem<U>(valueObjectType, data, options, paris, config?);
     query(query?: DataQuery, dataOptions?: DataOptions): Observable<DataSet<T>>;
-    getItemById(itemId: string | number, options?: DataOptions): Observable<T>;
+    getItemById(itemId: string | number, options?: DataOptions, params?: {
+        [index: string]: any;
+    }): Observable<T>;
     private setAllItems();
     getItemSaveData(item: T): Index;
 }
diff --git a/bundle/lib/repository/repository.js b/bundle/lib/repository/repository.js
@@ -267,7 +267,7 @@ var Repository = /** @class */ (function () {
             });
         });
     };
-    Repository.prototype.getItemById = function (itemId, options) {
+    Repository.prototype.getItemById = function (itemId, options, params) {
         var _this = this;
         if (options === void 0) { options = data_options_1.defaultDataOptions; }
         if (this.entity.values) {
@@ -285,7 +285,7 @@ var Repository = /** @class */ (function () {
         if (this.entity.loadAll)
             return this.setAllItems().map(function () { return _this._allValuesMap.get(String(itemId)); });
         else {
-            return this.dataStore.get(this.endpointName + "/" + itemId)
+            return this.dataStore.get(this.entity.parseItemQuery ? this.entity.parseItemQuery(itemId, this.entity, this.config) : this.endpointName + "/" + itemId, params && { params: params }, this.baseUrl)
                 .flatMap(function (data) { return _this.createItem(data, options); });
         }
     };

diff --git a/bundle/paris.umd.js b/bundle/paris.umd.js
@@ -786,7 +786,7 @@ var Repository = /** @class */ (function () {
             });
         });
     };
-    Repository.prototype.getItemById = function (itemId, options) {
+    Repository.prototype.getItemById = function (itemId, options, params) {
         var _this = this;
         if (options === void 0) { options = data_options.defaultDataOptions; }
         if (this.entity.values) {
@@ -804,7 +804,7 @@ var Repository = /** @class */ (function () {
         if (this.entity.loadAll)
             return this.setAllItems().map(function () { return _this._allValuesMap.get(String(itemId)); });
         else {
-            return this.dataStore.get(this.endpointName + "/" + itemId)
+            return this.dataStore.get(this.entity.parseItemQuery ? this.entity.parseItemQuery(itemId, this.entity, this.config) : this.endpointName + "/" + itemId, params && { params: params }, this.baseUrl)
                 .flatMap(function (data) { return _this.createItem(data, options); });
         }
     };