diff --git a/lib/angular2/index.js b/lib/angular2/index.js index e60c5b42..7f5b05d5 100644 --- a/lib/angular2/index.js +++ b/lib/angular2/index.js @@ -217,7 +217,8 @@ module.exports = function generate(ctx) { buildRouteParams: buildRouteParams, buildMethodParams: buildMethodParams, buildServiceImports: buildServiceImports, - normalizeMethodName: normalizeMethodName + normalizeMethodName: normalizeMethodName, + buildObservableType: buildObservableType } } ]); @@ -294,6 +295,17 @@ module.exports = function generate(ctx) { ? basicType : `Array<${basicType}>`; return finalType; } + /** + * @method buildObservableType + * @description + * Define observable type + */ + function buildObservableType(modelName, methodName) { + let type = 'any'; + if (methodName.match(/(^createMany$|^find)/g)) type = `Array<${modelName}>`; + if (methodName.match(/(^create$|upsert|^findById$|^findOne$)/g)) type = modelName; + return type; + } /** * @method buildServiceImports * @description @@ -316,6 +328,7 @@ module.exports = function generate(ctx) { { module: 'JSONSearchParams', from: '../core/search.params'}, { module: 'ErrorHandler', from: '../core/error.service'}, { module: 'Subject', from: 'rxjs/Subject'}, + { module: 'Observable', from: 'rxjs/Observable'}, { module: 'rxjs/add/operator/map' }, { module: modelName, from: `../../models/${modelName}`}, ]; @@ -394,6 +407,7 @@ module.exports = function generate(ctx) { { module: 'LoopBackAuth', from: './auth.service'}, { module: 'LoopBackConfig', from: '../../lb.config'}, { module: 'AccessToken', from: '../../models'}, + { module: 'ErrorObservable', from: 'rxjs/observable/ErrorObservable' }, { module: 'rxjs/add/operator/catch' }, { module: 'rxjs/add/operator/map' }, ]; diff --git a/lib/angular2/shared/index.ejs b/lib/angular2/shared/index.ejs index 33e5314a..4fa7fdaa 100644 --- a/lib/angular2/shared/index.ejs +++ b/lib/angular2/shared/index.ejs @@ -67,3 +67,4 @@ export * from './lb.config'; <% if ( isIo === 'enabled' ){ -%>export * from './sockets/index'; <% } -%> + diff --git a/lib/angular2/shared/models/flref.ejs b/lib/angular2/shared/models/flref.ejs index 4a36f25c..5f737198 100644 --- a/lib/angular2/shared/models/flref.ejs +++ b/lib/angular2/shared/models/flref.ejs @@ -1,8 +1,6 @@ import { Subject } from 'rxjs/Subject'; import { Observable } from 'rxjs/Observable'; -import { LoopBackConfig } from '../lb.config'; -import { AccessToken, LoopBackFilter } from './index'; -import { SocketConnections } from '../sockets/socket.connections'; +import { LoopBackFilter } from './index'; export class FireLoopRef { @@ -19,7 +17,7 @@ export class FireLoopRef { this.socket = socket; return this; } - + public upsert(data: any): Observable { let id: number = Math.floor(Math.random() * 100800) * Math.floor(Math.random() * 100700) * @@ -44,8 +42,9 @@ export class FireLoopRef { event = `${this.name}.${event}`; if (this.observables[event]) { return this.observables[event]; } let subject: Subject = new Subject(); - if (event.match(/(value)/)) - this.pull(event, filter, subject); + if (event.match(/(value)/)) { + this.pull(event, filter, subject); + } // Listen for broadcast announces this.socket.on( // When there is a broadcast announce @@ -80,4 +79,4 @@ export class FireLoopRef { // TODO ADD UNLIMITED LEVELS } } -} \ No newline at end of file +} diff --git a/lib/angular2/shared/models/index.ejs b/lib/angular2/shared/models/index.ejs index 5f38ea48..637f76d8 100644 --- a/lib/angular2/shared/models/index.ejs +++ b/lib/angular2/shared/models/index.ejs @@ -9,4 +9,5 @@ export * from './<%- modelName %>'; export * from './BaseModels'; <% if ( isIo === 'enabled' ){ -%>export * from './FireLoopRef'; <% } --%> \ No newline at end of file +-%> + diff --git a/lib/angular2/shared/services/custom/service.ejs b/lib/angular2/shared/services/custom/service.ejs index c5004954..8e6c48ae 100644 --- a/lib/angular2/shared/services/custom/service.ejs +++ b/lib/angular2/shared/services/custom/service.ejs @@ -34,7 +34,7 @@ export class <%-: modelName %>Api extends BaseLoopBackApi { ngdocForMethod(modelName, methodName, action, httpVerb, fullPath); if (methodName === 'createChangeStream') { -%> - public createChangeStream() { + public createChangeStream(): Observable { let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + <%-: fullPath | q %>; let subject = new Subject(); @@ -68,7 +68,7 @@ export class <%-: modelName %>Api extends BaseLoopBackApi { return (param.http && param.http.source === 'path') || (param.arg && param.arg.match(/(id|fk|file|container)/)); }); -%> - public <%- normalizeMethodName(methodName) %>(<%- buildMethodParams(model, methodName, action.accepts) %>) { + public <%- normalizeMethodName(methodName) %>(<%- buildMethodParams(model, methodName, action.accepts) %>): Observable<<%- buildObservableType(modelName, methodName) %>> { let method: string = <%-: httpVerb | q %>; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + <%-: fullPath | q %>; @@ -92,7 +92,7 @@ if (model.isUser && methodName === 'login') { %> ); return result; <% -} else if (methodName.match(/(^create$|upsert|findById|findOne)/g)) { %>; +} else if (methodName.match(/(^create$|upsert|^findById$|^findOne$)/g)) { %>; return result.map((instance: <%- modelName %>) => new <%-: modelName %>(instance));<% } else if (methodName.match(/(^createMany$|^find)/g)) { %>; return result.map((instances: Array<<%- modelName %>>) => @@ -110,7 +110,7 @@ if (model.isUser && methodName === 'login') { %> httpVerb !== 'HEAD'){ -%> - public on<%- normalizeMethodName(methodName, true) %>(<%- buildMethodParams(model, methodName, action.accepts, true) %>) { + public on<%- normalizeMethodName(methodName, true) %>(<%- buildMethodParams(model, methodName, action.accepts, true) %>): Observable<<%- buildObservableType(modelName, methodName) %>> { let method: string = <%-: httpVerb | q %>; let url: string = "/" + LoopBackConfig.getApiVersion() + <%-: fullPath | q %>; @@ -118,7 +118,16 @@ if (model.isUser && methodName === 'login') { %> let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); - return result; + <% +if (methodName.match(/(^create$|upsert|^findById$|^findOne$)/g)) { %> + return result.map((instance: <%- modelName %>) => new <%-: modelName %>(instance));<% +} else if (methodName.match(/(^createMany$|^find)/g)) { %>; + return result.map((instances: Array<<%- modelName %>>) => + instances.map((instance: <%- modelName %>) => new <%-: modelName %>(instance)) + );<% +} else { %>; + return result;<% +} %> } <% }} -%> <% }); // model.methods.foreach -%> diff --git a/package.json b/package.json index e95ff9e9..6a6a5bc3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mean-expert/loopback-sdk-builder", - "version": "2.1.0-beta.4", + "version": "2.1.0-beta.5", "description": "Tool for auto-generating Software Development Kits (SDKs) for LoopBack", "bin": { "lb-sdk": "bin/lb-sdk" diff --git a/tests/angular2/src/app/room-service.service.spec.ts b/tests/angular2/src/app/room-service.service.spec.ts index 75d7c01e..b5b03576 100644 --- a/tests/angular2/src/app/room-service.service.spec.ts +++ b/tests/angular2/src/app/room-service.service.spec.ts @@ -110,7 +110,7 @@ describe('Service: Room Service', () => { }); }) )); - + /** It can not be tested for now because a strange Angular 2 error (No info available) This is tested running the Test Application using ng serve instead. diff --git a/tests/angular2/src/app/shared/sdk/index.ts b/tests/angular2/src/app/shared/sdk/index.ts index 7653139c..1d3c7cc0 100644 --- a/tests/angular2/src/app/shared/sdk/index.ts +++ b/tests/angular2/src/app/shared/sdk/index.ts @@ -88,4 +88,4 @@ export class SDKModule { export * from './models/index'; export * from './services/index'; export * from './lb.config'; -export * from './sockets/index'; \ No newline at end of file +export * from './sockets/index'; diff --git a/tests/angular2/src/app/shared/sdk/models/FireLoopRef.ts b/tests/angular2/src/app/shared/sdk/models/FireLoopRef.ts index 4a36f25c..5f737198 100644 --- a/tests/angular2/src/app/shared/sdk/models/FireLoopRef.ts +++ b/tests/angular2/src/app/shared/sdk/models/FireLoopRef.ts @@ -1,8 +1,6 @@ import { Subject } from 'rxjs/Subject'; import { Observable } from 'rxjs/Observable'; -import { LoopBackConfig } from '../lb.config'; -import { AccessToken, LoopBackFilter } from './index'; -import { SocketConnections } from '../sockets/socket.connections'; +import { LoopBackFilter } from './index'; export class FireLoopRef { @@ -19,7 +17,7 @@ export class FireLoopRef { this.socket = socket; return this; } - + public upsert(data: any): Observable { let id: number = Math.floor(Math.random() * 100800) * Math.floor(Math.random() * 100700) * @@ -44,8 +42,9 @@ export class FireLoopRef { event = `${this.name}.${event}`; if (this.observables[event]) { return this.observables[event]; } let subject: Subject = new Subject(); - if (event.match(/(value)/)) - this.pull(event, filter, subject); + if (event.match(/(value)/)) { + this.pull(event, filter, subject); + } // Listen for broadcast announces this.socket.on( // When there is a broadcast announce @@ -80,4 +79,4 @@ export class FireLoopRef { // TODO ADD UNLIMITED LEVELS } } -} \ No newline at end of file +} diff --git a/tests/angular2/src/app/shared/sdk/models/index.ts b/tests/angular2/src/app/shared/sdk/models/index.ts index 8e7c5010..f941081d 100644 --- a/tests/angular2/src/app/shared/sdk/models/index.ts +++ b/tests/angular2/src/app/shared/sdk/models/index.ts @@ -11,4 +11,4 @@ export * from './RoomAccount'; export * from './Storage'; export * from './Core'; export * from './BaseModels'; -export * from './FireLoopRef'; \ No newline at end of file +export * from './FireLoopRef'; diff --git a/tests/angular2/src/app/shared/sdk/services/core/base.service.ts b/tests/angular2/src/app/shared/sdk/services/core/base.service.ts index 270fd5f5..27d22b2b 100644 --- a/tests/angular2/src/app/shared/sdk/services/core/base.service.ts +++ b/tests/angular2/src/app/shared/sdk/services/core/base.service.ts @@ -7,6 +7,7 @@ import { ErrorHandler } from './error.service'; import { LoopBackAuth } from './auth.service'; import { LoopBackConfig } from '../../lb.config'; import { AccessToken } from '../../models'; +import { ErrorObservable } from 'rxjs/observable/ErrorObservable'; import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/map'; import { Subject } from 'rxjs/Subject'; diff --git a/tests/angular2/src/app/shared/sdk/services/custom/Account.ts b/tests/angular2/src/app/shared/sdk/services/custom/Account.ts index e3e5a153..b48288e8 100644 --- a/tests/angular2/src/app/shared/sdk/services/custom/Account.ts +++ b/tests/angular2/src/app/shared/sdk/services/custom/Account.ts @@ -8,6 +8,7 @@ import { LoopBackFilter, SDKToken, AccessToken } from '../../models/BaseModels'; import { JSONSearchParams } from '../core/search.params'; import { ErrorHandler } from '../core/error.service'; import { Subject } from 'rxjs/Subject'; +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { Account } from '../../models/Account'; import { RoomAccount } from '../../models/RoomAccount'; @@ -47,7 +48,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public findByIdAccessTokens(id: any, fk: any) { + public findByIdAccessTokens(id: any, fk: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens/:fk"; @@ -58,7 +59,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody); - return result.map((instance: Account) => new Account(instance)); + return result; } /** @@ -74,7 +75,7 @@ export class AccountApi extends BaseLoopBackApi { * * This method returns no data. */ - public destroyByIdAccessTokens(id: any, fk: any) { + public destroyByIdAccessTokens(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens/:fk"; @@ -88,7 +89,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onDestroyByIdAccessTokens(id: any) { + public onDestroyByIdAccessTokens(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens/:fk"; @@ -98,6 +99,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -121,7 +123,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public updateByIdAccessTokens(id: any, fk: any, data: any = undefined) { + public updateByIdAccessTokens(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens/:fk"; @@ -137,7 +139,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onUpdateByIdAccessTokens(id: any) { + public onUpdateByIdAccessTokens(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens/:fk"; @@ -147,6 +149,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -166,7 +169,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public findByIdRooms(id: any, fk: any) { + public findByIdRooms(id: any, fk: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms/:fk"; @@ -177,7 +180,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody); - return result.map((instance: Account) => new Account(instance)); + return result; } /** @@ -193,7 +196,7 @@ export class AccountApi extends BaseLoopBackApi { * * This method returns no data. */ - public destroyByIdRooms(id: any, fk: any) { + public destroyByIdRooms(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms/:fk"; @@ -207,7 +210,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onDestroyByIdRooms(id: any) { + public onDestroyByIdRooms(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms/:fk"; @@ -217,6 +220,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -240,7 +244,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public updateByIdRooms(id: any, fk: any, data: any = undefined) { + public updateByIdRooms(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms/:fk"; @@ -256,7 +260,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onUpdateByIdRooms(id: any) { + public onUpdateByIdRooms(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms/:fk"; @@ -266,6 +270,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -289,7 +294,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public linkRooms(id: any, fk: any, data: any = undefined) { + public linkRooms(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms/rel/:fk"; @@ -305,7 +310,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onLinkRooms(id: any) { + public onLinkRooms(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms/rel/:fk"; @@ -315,6 +320,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -331,7 +337,7 @@ export class AccountApi extends BaseLoopBackApi { * * This method returns no data. */ - public unlinkRooms(id: any, fk: any) { + public unlinkRooms(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms/rel/:fk"; @@ -345,7 +351,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onUnlinkRooms(id: any) { + public onUnlinkRooms(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms/rel/:fk"; @@ -355,6 +361,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -374,7 +381,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public existsRooms(id: any, fk: any) { + public existsRooms(id: any, fk: any): Observable { let method: string = "HEAD"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms/rel/:fk"; @@ -404,7 +411,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public findByIdAdministrations(id: any, fk: any) { + public findByIdAdministrations(id: any, fk: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations/:fk"; @@ -415,7 +422,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody); - return result.map((instance: Account) => new Account(instance)); + return result; } /** @@ -431,7 +438,7 @@ export class AccountApi extends BaseLoopBackApi { * * This method returns no data. */ - public destroyByIdAdministrations(id: any, fk: any) { + public destroyByIdAdministrations(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations/:fk"; @@ -445,7 +452,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onDestroyByIdAdministrations(id: any) { + public onDestroyByIdAdministrations(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations/:fk"; @@ -455,6 +462,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -478,7 +486,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public updateByIdAdministrations(id: any, fk: any, data: any = undefined) { + public updateByIdAdministrations(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations/:fk"; @@ -494,7 +502,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onUpdateByIdAdministrations(id: any) { + public onUpdateByIdAdministrations(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations/:fk"; @@ -504,6 +512,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -527,7 +536,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public linkAdministrations(id: any, fk: any, data: any = undefined) { + public linkAdministrations(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations/rel/:fk"; @@ -543,7 +552,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onLinkAdministrations(id: any) { + public onLinkAdministrations(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations/rel/:fk"; @@ -553,6 +562,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -569,7 +579,7 @@ export class AccountApi extends BaseLoopBackApi { * * This method returns no data. */ - public unlinkAdministrations(id: any, fk: any) { + public unlinkAdministrations(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations/rel/:fk"; @@ -583,7 +593,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onUnlinkAdministrations(id: any) { + public onUnlinkAdministrations(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations/rel/:fk"; @@ -593,6 +603,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -612,7 +623,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public existsAdministrations(id: any, fk: any) { + public existsAdministrations(id: any, fk: any): Observable { let method: string = "HEAD"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations/rel/:fk"; @@ -642,7 +653,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public getAccessTokens(id: any, filter: LoopBackFilter = undefined) { + public getAccessTokens(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens"; @@ -674,7 +685,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public createAccessTokens(id: any, data: any = undefined) { + public createAccessTokens(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens"; @@ -689,7 +700,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onCreateAccessTokens(id: any) { + public onCreateAccessTokens(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens"; @@ -699,6 +710,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -713,7 +725,7 @@ export class AccountApi extends BaseLoopBackApi { * * This method returns no data. */ - public deleteAccessTokens(id: any) { + public deleteAccessTokens(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens"; @@ -726,7 +738,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onDeleteAccessTokens(id: any) { + public onDeleteAccessTokens(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens"; @@ -736,6 +748,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -754,7 +767,7 @@ export class AccountApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public countAccessTokens(id: any, where: any = undefined) { + public countAccessTokens(id: any, where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens/count"; @@ -784,7 +797,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public getRooms(id: any, filter: LoopBackFilter = undefined) { + public getRooms(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms"; @@ -816,7 +829,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public createRooms(id: any, data: any = undefined) { + public createRooms(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms"; @@ -831,7 +844,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onCreateRooms(id: any) { + public onCreateRooms(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms"; @@ -841,6 +854,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -855,7 +869,7 @@ export class AccountApi extends BaseLoopBackApi { * * This method returns no data. */ - public deleteRooms(id: any) { + public deleteRooms(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms"; @@ -868,7 +882,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onDeleteRooms(id: any) { + public onDeleteRooms(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms"; @@ -878,6 +892,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -896,7 +911,7 @@ export class AccountApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public countRooms(id: any, where: any = undefined) { + public countRooms(id: any, where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms/count"; @@ -926,7 +941,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public getAdministrations(id: any, filter: LoopBackFilter = undefined) { + public getAdministrations(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations"; @@ -958,7 +973,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public createAdministrations(id: any, data: any = undefined) { + public createAdministrations(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations"; @@ -973,7 +988,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onCreateAdministrations(id: any) { + public onCreateAdministrations(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations"; @@ -983,6 +998,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -997,7 +1013,7 @@ export class AccountApi extends BaseLoopBackApi { * * This method returns no data. */ - public deleteAdministrations(id: any) { + public deleteAdministrations(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations"; @@ -1010,7 +1026,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onDeleteAdministrations(id: any) { + public onDeleteAdministrations(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations"; @@ -1020,6 +1036,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1038,7 +1055,7 @@ export class AccountApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public countAdministrations(id: any, where: any = undefined) { + public countAdministrations(id: any, where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations/count"; @@ -1068,7 +1085,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public create(data: any = undefined) { + public create(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts"; @@ -1081,7 +1098,7 @@ export class AccountApi extends BaseLoopBackApi { return result.map((instance: Account) => new Account(instance)); } - public onCreate() { + public onCreate(): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts"; @@ -1089,7 +1106,8 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); - return result; + + return result.map((instance: Account) => new Account(instance)); } /** @@ -1108,7 +1126,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public upsert(data: any = undefined) { + public upsert(data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts"; @@ -1121,7 +1139,7 @@ export class AccountApi extends BaseLoopBackApi { return result.map((instance: Account) => new Account(instance)); } - public onUpsert() { + public onUpsert(): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts"; @@ -1129,7 +1147,8 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); - return result; + + return result.map((instance: Account) => new Account(instance)); } /** @@ -1148,7 +1167,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public replaceOrCreate(data: any = undefined) { + public replaceOrCreate(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/replaceOrCreate"; @@ -1161,7 +1180,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onReplaceOrCreate() { + public onReplaceOrCreate(): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/replaceOrCreate"; @@ -1169,6 +1188,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1190,7 +1210,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public upsertWithWhere(where: any = undefined, data: any = undefined) { + public upsertWithWhere(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/upsertWithWhere"; @@ -1204,7 +1224,7 @@ export class AccountApi extends BaseLoopBackApi { return result.map((instance: Account) => new Account(instance)); } - public onUpsertWithWhere(where: any = undefined) { + public onUpsertWithWhere(where: any = undefined): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/upsertWithWhere"; @@ -1212,7 +1232,8 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); - return result; + + return result.map((instance: Account) => new Account(instance)); } /** @@ -1228,7 +1249,7 @@ export class AccountApi extends BaseLoopBackApi { * * - `exists` – `{boolean}` - */ - public exists(id: any) { + public exists(id: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/exists"; @@ -1257,7 +1278,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public findById(id: any, filter: LoopBackFilter = undefined) { + public findById(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id"; @@ -1289,7 +1310,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public replaceById(id: any, data: any = undefined) { + public replaceById(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/replace"; @@ -1304,7 +1325,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onReplaceById(id: any) { + public onReplaceById(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/replace"; @@ -1314,6 +1335,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1331,7 +1353,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public find(filter: LoopBackFilter = undefined) { + public find(filter: LoopBackFilter = undefined): Observable> { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts"; @@ -1359,7 +1381,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public findOne(filter: LoopBackFilter = undefined) { + public findOne(filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/findOne"; @@ -1386,7 +1408,7 @@ export class AccountApi extends BaseLoopBackApi { * * The number of instances updated */ - public updateAll(where: any = undefined, data: any = undefined) { + public updateAll(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/update"; @@ -1400,7 +1422,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onUpdateAll(where: any = undefined) { + public onUpdateAll(where: any = undefined): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/update"; @@ -1408,6 +1430,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1425,7 +1448,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public deleteById(id: any) { + public deleteById(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id"; @@ -1438,7 +1461,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onDeleteById(id: any) { + public onDeleteById(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id"; @@ -1448,6 +1471,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1464,7 +1488,7 @@ export class AccountApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public count(where: any = undefined) { + public count(where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/count"; @@ -1494,7 +1518,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public updateAttributes(id: any, data: any = undefined) { + public updateAttributes(id: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id"; @@ -1509,7 +1533,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onUpdateAttributes(id: any) { + public onUpdateAttributes(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id"; @@ -1519,6 +1543,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1537,7 +1562,7 @@ export class AccountApi extends BaseLoopBackApi { * * - `changes` – `{ReadableStream}` - */ - public createChangeStream() { + public createChangeStream(): Observable { let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/change-stream"; let subject = new Subject(); @@ -1576,7 +1601,7 @@ export class AccountApi extends BaseLoopBackApi { * * */ - public login(credentials: any, include: any = 'user', rememberMe: boolean = true) { + public login(credentials: any, include: any = 'user', rememberMe: boolean = true): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/login"; @@ -1612,7 +1637,7 @@ export class AccountApi extends BaseLoopBackApi { * * This method returns no data. */ - public logout() { + public logout(): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/logout"; @@ -1640,7 +1665,7 @@ export class AccountApi extends BaseLoopBackApi { * * This method returns no data. */ - public confirm(uid: any, token: any, redirect: any = undefined) { + public confirm(uid: any, token: any, redirect: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/confirm"; @@ -1668,7 +1693,7 @@ export class AccountApi extends BaseLoopBackApi { * * This method returns no data. */ - public resetPassword(options: any) { + public resetPassword(options: any): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/reset"; @@ -1699,7 +1724,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public createManyAccessTokens(id: any, data: Array = undefined) { + public createManyAccessTokens(id: any, data: Array = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens"; @@ -1714,7 +1739,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onCreateManyAccessTokens(id: any) { + public onCreateManyAccessTokens(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/accessTokens"; @@ -1724,6 +1749,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1745,7 +1771,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public createManyRooms(id: any, data: Array = undefined) { + public createManyRooms(id: any, data: Array = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms"; @@ -1760,7 +1786,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onCreateManyRooms(id: any) { + public onCreateManyRooms(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/rooms"; @@ -1770,6 +1796,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1791,7 +1818,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public createManyAdministrations(id: any, data: Array = undefined) { + public createManyAdministrations(id: any, data: Array = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations"; @@ -1806,7 +1833,7 @@ export class AccountApi extends BaseLoopBackApi { return result; } - public onCreateManyAdministrations(id: any) { + public onCreateManyAdministrations(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts/:id/administrations"; @@ -1816,6 +1843,7 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1835,7 +1863,7 @@ export class AccountApi extends BaseLoopBackApi { * This usually means the response is a `Account` object.) * */ - public createMany(data: Array = undefined) { + public createMany(data: Array = undefined): Observable> { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Accounts"; @@ -1850,7 +1878,7 @@ export class AccountApi extends BaseLoopBackApi { ); } - public onCreateMany() { + public onCreateMany(): Observable> { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/Accounts"; @@ -1858,7 +1886,10 @@ export class AccountApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); - return result; + ; + return result.map((instances: Array) => + instances.map((instance: Account) => new Account(instance)) + ); } /** * @ngdoc method diff --git a/tests/angular2/src/app/shared/sdk/services/custom/ApplicationCredential.ts b/tests/angular2/src/app/shared/sdk/services/custom/ApplicationCredential.ts index 4737d9ed..f430254d 100644 --- a/tests/angular2/src/app/shared/sdk/services/custom/ApplicationCredential.ts +++ b/tests/angular2/src/app/shared/sdk/services/custom/ApplicationCredential.ts @@ -8,6 +8,7 @@ import { LoopBackFilter, } from '../../models/BaseModels'; import { JSONSearchParams } from '../core/search.params'; import { ErrorHandler } from '../core/error.service'; import { Subject } from 'rxjs/Subject'; +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { ApplicationCredential } from '../../models/ApplicationCredential'; @@ -45,7 +46,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * This usually means the response is a `ApplicationCredential` object.) * */ - public create(data: any = undefined) { + public create(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials"; @@ -74,7 +75,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * This usually means the response is a `ApplicationCredential` object.) * */ - public upsert(data: any = undefined) { + public upsert(data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials"; @@ -103,7 +104,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * This usually means the response is a `ApplicationCredential` object.) * */ - public replaceOrCreate(data: any = undefined) { + public replaceOrCreate(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials/replaceOrCreate"; @@ -134,7 +135,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * This usually means the response is a `ApplicationCredential` object.) * */ - public upsertWithWhere(where: any = undefined, data: any = undefined) { + public upsertWithWhere(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials/upsertWithWhere"; @@ -161,7 +162,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * * - `exists` – `{boolean}` - */ - public exists(id: any) { + public exists(id: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials/:id/exists"; @@ -190,7 +191,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * This usually means the response is a `ApplicationCredential` object.) * */ - public findById(id: any, filter: LoopBackFilter = undefined) { + public findById(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials/:id"; @@ -222,7 +223,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * This usually means the response is a `ApplicationCredential` object.) * */ - public replaceById(id: any, data: any = undefined) { + public replaceById(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials/:id/replace"; @@ -251,7 +252,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * This usually means the response is a `ApplicationCredential` object.) * */ - public find(filter: LoopBackFilter = undefined) { + public find(filter: LoopBackFilter = undefined): Observable> { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials"; @@ -279,7 +280,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * This usually means the response is a `ApplicationCredential` object.) * */ - public findOne(filter: LoopBackFilter = undefined) { + public findOne(filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials/findOne"; @@ -306,7 +307,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * * The number of instances updated */ - public updateAll(where: any = undefined, data: any = undefined) { + public updateAll(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials/update"; @@ -334,7 +335,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * This usually means the response is a `ApplicationCredential` object.) * */ - public deleteById(id: any) { + public deleteById(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials/:id"; @@ -360,7 +361,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public count(where: any = undefined) { + public count(where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials/count"; @@ -390,7 +391,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * This usually means the response is a `ApplicationCredential` object.) * */ - public updateAttributes(id: any, data: any = undefined) { + public updateAttributes(id: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials/:id"; @@ -420,7 +421,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * * - `changes` – `{ReadableStream}` - */ - public createChangeStream() { + public createChangeStream(): Observable { let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials/change-stream"; let subject = new Subject(); @@ -450,7 +451,7 @@ export class ApplicationCredentialApi extends BaseLoopBackApi { * This usually means the response is a `ApplicationCredential` object.) * */ - public createMany(data: Array = undefined) { + public createMany(data: Array = undefined): Observable> { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/ApplicationCredentials"; diff --git a/tests/angular2/src/app/shared/sdk/services/custom/Category.ts b/tests/angular2/src/app/shared/sdk/services/custom/Category.ts index f2be7606..24a67124 100644 --- a/tests/angular2/src/app/shared/sdk/services/custom/Category.ts +++ b/tests/angular2/src/app/shared/sdk/services/custom/Category.ts @@ -8,6 +8,7 @@ import { LoopBackFilter, } from '../../models/BaseModels'; import { JSONSearchParams } from '../core/search.params'; import { ErrorHandler } from '../core/error.service'; import { Subject } from 'rxjs/Subject'; +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { Category } from '../../models/Category'; import { Room } from '../../models/Room'; @@ -46,7 +47,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public findByIdRooms(id: any, fk: any) { + public findByIdRooms(id: any, fk: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/rooms/:fk"; @@ -57,7 +58,7 @@ export class CategoryApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody); - return result.map((instance: Category) => new Category(instance)); + return result; } /** @@ -73,7 +74,7 @@ export class CategoryApi extends BaseLoopBackApi { * * This method returns no data. */ - public destroyByIdRooms(id: any, fk: any) { + public destroyByIdRooms(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/rooms/:fk"; @@ -107,7 +108,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public updateByIdRooms(id: any, fk: any, data: any = undefined) { + public updateByIdRooms(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/rooms/:fk"; @@ -143,7 +144,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public linkRooms(id: any, fk: any, data: any = undefined) { + public linkRooms(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/rooms/rel/:fk"; @@ -172,7 +173,7 @@ export class CategoryApi extends BaseLoopBackApi { * * This method returns no data. */ - public unlinkRooms(id: any, fk: any) { + public unlinkRooms(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/rooms/rel/:fk"; @@ -202,7 +203,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public existsRooms(id: any, fk: any) { + public existsRooms(id: any, fk: any): Observable { let method: string = "HEAD"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/rooms/rel/:fk"; @@ -232,7 +233,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public getRooms(id: any, filter: LoopBackFilter = undefined) { + public getRooms(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/rooms"; @@ -264,7 +265,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public createRooms(id: any, data: any = undefined) { + public createRooms(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/rooms"; @@ -290,7 +291,7 @@ export class CategoryApi extends BaseLoopBackApi { * * This method returns no data. */ - public deleteRooms(id: any) { + public deleteRooms(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/rooms"; @@ -318,7 +319,7 @@ export class CategoryApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public countRooms(id: any, where: any = undefined) { + public countRooms(id: any, where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/rooms/count"; @@ -348,7 +349,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public create(data: any = undefined) { + public create(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories"; @@ -377,7 +378,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public upsert(data: any = undefined) { + public upsert(data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories"; @@ -406,7 +407,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public replaceOrCreate(data: any = undefined) { + public replaceOrCreate(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/replaceOrCreate"; @@ -437,7 +438,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public upsertWithWhere(where: any = undefined, data: any = undefined) { + public upsertWithWhere(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/upsertWithWhere"; @@ -464,7 +465,7 @@ export class CategoryApi extends BaseLoopBackApi { * * - `exists` – `{boolean}` - */ - public exists(id: any) { + public exists(id: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/exists"; @@ -493,7 +494,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public findById(id: any, filter: LoopBackFilter = undefined) { + public findById(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id"; @@ -525,7 +526,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public replaceById(id: any, data: any = undefined) { + public replaceById(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/replace"; @@ -554,7 +555,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public find(filter: LoopBackFilter = undefined) { + public find(filter: LoopBackFilter = undefined): Observable> { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories"; @@ -582,7 +583,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public findOne(filter: LoopBackFilter = undefined) { + public findOne(filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/findOne"; @@ -609,7 +610,7 @@ export class CategoryApi extends BaseLoopBackApi { * * The number of instances updated */ - public updateAll(where: any = undefined, data: any = undefined) { + public updateAll(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/update"; @@ -637,7 +638,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public deleteById(id: any) { + public deleteById(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id"; @@ -663,7 +664,7 @@ export class CategoryApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public count(where: any = undefined) { + public count(where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/count"; @@ -693,7 +694,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public updateAttributes(id: any, data: any = undefined) { + public updateAttributes(id: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id"; @@ -723,7 +724,7 @@ export class CategoryApi extends BaseLoopBackApi { * * - `changes` – `{ReadableStream}` - */ - public createChangeStream() { + public createChangeStream(): Observable { let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/change-stream"; let subject = new Subject(); @@ -755,7 +756,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public createManyRooms(id: any, data: Array = undefined) { + public createManyRooms(id: any, data: Array = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories/:id/rooms"; @@ -786,7 +787,7 @@ export class CategoryApi extends BaseLoopBackApi { * This usually means the response is a `Category` object.) * */ - public createMany(data: Array = undefined) { + public createMany(data: Array = undefined): Observable> { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Categories"; diff --git a/tests/angular2/src/app/shared/sdk/services/custom/Core.ts b/tests/angular2/src/app/shared/sdk/services/custom/Core.ts index 4f61c41c..829238e9 100644 --- a/tests/angular2/src/app/shared/sdk/services/custom/Core.ts +++ b/tests/angular2/src/app/shared/sdk/services/custom/Core.ts @@ -8,6 +8,7 @@ import { LoopBackFilter, } from '../../models/BaseModels'; import { JSONSearchParams } from '../core/search.params'; import { ErrorHandler } from '../core/error.service'; import { Subject } from 'rxjs/Subject'; +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { Core } from '../../models/Core'; @@ -49,7 +50,7 @@ export class CoreApi extends BaseLoopBackApi { * This usually means the response is a `Core` object.) * */ - public run(path: any = undefined, body: any = undefined) { + public run(path: any = undefined, body: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/cores/run/:path"; @@ -80,7 +81,7 @@ export class CoreApi extends BaseLoopBackApi { * * This method returns no data. */ - public invoke(request: any = undefined) { + public invoke(request: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/cores/invoke"; diff --git a/tests/angular2/src/app/shared/sdk/services/custom/Like.ts b/tests/angular2/src/app/shared/sdk/services/custom/Like.ts index d4f2e0e9..400a9f3f 100644 --- a/tests/angular2/src/app/shared/sdk/services/custom/Like.ts +++ b/tests/angular2/src/app/shared/sdk/services/custom/Like.ts @@ -8,6 +8,7 @@ import { LoopBackFilter, } from '../../models/BaseModels'; import { JSONSearchParams } from '../core/search.params'; import { ErrorHandler } from '../core/error.service'; import { Subject } from 'rxjs/Subject'; +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { Like } from '../../models/Like'; import { Room } from '../../models/Room'; @@ -46,7 +47,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public getRoom(id: any, refresh: any = undefined) { + public getRoom(id: any, refresh: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/:id/room"; @@ -76,7 +77,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public getMessage(id: any, refresh: any = undefined) { + public getMessage(id: any, refresh: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/:id/message"; @@ -106,7 +107,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public create(data: any = undefined) { + public create(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes"; @@ -135,7 +136,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public upsert(data: any = undefined) { + public upsert(data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes"; @@ -164,7 +165,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public replaceOrCreate(data: any = undefined) { + public replaceOrCreate(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/replaceOrCreate"; @@ -195,7 +196,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public upsertWithWhere(where: any = undefined, data: any = undefined) { + public upsertWithWhere(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/upsertWithWhere"; @@ -222,7 +223,7 @@ export class LikeApi extends BaseLoopBackApi { * * - `exists` – `{boolean}` - */ - public exists(id: any) { + public exists(id: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/:id/exists"; @@ -251,7 +252,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public findById(id: any, filter: LoopBackFilter = undefined) { + public findById(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/:id"; @@ -283,7 +284,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public replaceById(id: any, data: any = undefined) { + public replaceById(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/:id/replace"; @@ -312,7 +313,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public find(filter: LoopBackFilter = undefined) { + public find(filter: LoopBackFilter = undefined): Observable> { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes"; @@ -340,7 +341,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public findOne(filter: LoopBackFilter = undefined) { + public findOne(filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/findOne"; @@ -367,7 +368,7 @@ export class LikeApi extends BaseLoopBackApi { * * The number of instances updated */ - public updateAll(where: any = undefined, data: any = undefined) { + public updateAll(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/update"; @@ -395,7 +396,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public deleteById(id: any) { + public deleteById(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/:id"; @@ -421,7 +422,7 @@ export class LikeApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public count(where: any = undefined) { + public count(where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/count"; @@ -451,7 +452,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public updateAttributes(id: any, data: any = undefined) { + public updateAttributes(id: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/:id"; @@ -481,7 +482,7 @@ export class LikeApi extends BaseLoopBackApi { * * - `changes` – `{ReadableStream}` - */ - public createChangeStream() { + public createChangeStream(): Observable { let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes/change-stream"; let subject = new Subject(); @@ -511,7 +512,7 @@ export class LikeApi extends BaseLoopBackApi { * This usually means the response is a `Like` object.) * */ - public createMany(data: Array = undefined) { + public createMany(data: Array = undefined): Observable> { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/likes"; diff --git a/tests/angular2/src/app/shared/sdk/services/custom/Room.ts b/tests/angular2/src/app/shared/sdk/services/custom/Room.ts index 00c6daa5..c40b1b7c 100644 --- a/tests/angular2/src/app/shared/sdk/services/custom/Room.ts +++ b/tests/angular2/src/app/shared/sdk/services/custom/Room.ts @@ -8,6 +8,7 @@ import { LoopBackFilter, } from '../../models/BaseModels'; import { JSONSearchParams } from '../core/search.params'; import { ErrorHandler } from '../core/error.service'; import { Subject } from 'rxjs/Subject'; +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { Room } from '../../models/Room'; import { Like } from '../../models/Like'; @@ -49,7 +50,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public findByIdMessages(id: any, fk: any) { + public findByIdMessages(id: any, fk: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages/:fk"; @@ -60,7 +61,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody); - return result.map((instance: Room) => new Room(instance)); + return result; } /** @@ -76,7 +77,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public destroyByIdMessages(id: any, fk: any) { + public destroyByIdMessages(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages/:fk"; @@ -90,7 +91,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onDestroyByIdMessages(id: any) { + public onDestroyByIdMessages(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages/:fk"; @@ -100,6 +101,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -123,7 +125,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public updateByIdMessages(id: any, fk: any, data: any = undefined) { + public updateByIdMessages(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages/:fk"; @@ -139,7 +141,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onUpdateByIdMessages(id: any) { + public onUpdateByIdMessages(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages/:fk"; @@ -149,6 +151,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -168,7 +171,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public findByIdLikes(id: any, fk: any) { + public findByIdLikes(id: any, fk: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes/:fk"; @@ -179,7 +182,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody); - return result.map((instance: Room) => new Room(instance)); + return result; } /** @@ -195,7 +198,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public destroyByIdLikes(id: any, fk: any) { + public destroyByIdLikes(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes/:fk"; @@ -209,7 +212,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onDestroyByIdLikes(id: any) { + public onDestroyByIdLikes(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes/:fk"; @@ -219,6 +222,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -242,7 +246,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public updateByIdLikes(id: any, fk: any, data: any = undefined) { + public updateByIdLikes(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes/:fk"; @@ -258,7 +262,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onUpdateByIdLikes(id: any) { + public onUpdateByIdLikes(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes/:fk"; @@ -268,6 +272,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -287,7 +292,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public findByIdCategories(id: any, fk: any) { + public findByIdCategories(id: any, fk: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories/:fk"; @@ -298,7 +303,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody); - return result.map((instance: Room) => new Room(instance)); + return result; } /** @@ -314,7 +319,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public destroyByIdCategories(id: any, fk: any) { + public destroyByIdCategories(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories/:fk"; @@ -328,7 +333,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onDestroyByIdCategories(id: any) { + public onDestroyByIdCategories(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories/:fk"; @@ -338,6 +343,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -361,7 +367,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public updateByIdCategories(id: any, fk: any, data: any = undefined) { + public updateByIdCategories(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories/:fk"; @@ -377,7 +383,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onUpdateByIdCategories(id: any) { + public onUpdateByIdCategories(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories/:fk"; @@ -387,6 +393,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -410,7 +417,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public linkCategories(id: any, fk: any, data: any = undefined) { + public linkCategories(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories/rel/:fk"; @@ -426,7 +433,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onLinkCategories(id: any) { + public onLinkCategories(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories/rel/:fk"; @@ -436,6 +443,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -452,7 +460,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public unlinkCategories(id: any, fk: any) { + public unlinkCategories(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories/rel/:fk"; @@ -466,7 +474,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onUnlinkCategories(id: any) { + public onUnlinkCategories(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories/rel/:fk"; @@ -476,6 +484,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -495,7 +504,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public existsCategories(id: any, fk: any) { + public existsCategories(id: any, fk: any): Observable { let method: string = "HEAD"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories/rel/:fk"; @@ -525,7 +534,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public findByIdAccounts(id: any, fk: any) { + public findByIdAccounts(id: any, fk: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts/:fk"; @@ -536,7 +545,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody); - return result.map((instance: Room) => new Room(instance)); + return result; } /** @@ -552,7 +561,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public destroyByIdAccounts(id: any, fk: any) { + public destroyByIdAccounts(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts/:fk"; @@ -566,7 +575,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onDestroyByIdAccounts(id: any) { + public onDestroyByIdAccounts(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts/:fk"; @@ -576,6 +585,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -599,7 +609,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public updateByIdAccounts(id: any, fk: any, data: any = undefined) { + public updateByIdAccounts(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts/:fk"; @@ -615,7 +625,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onUpdateByIdAccounts(id: any) { + public onUpdateByIdAccounts(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts/:fk"; @@ -625,6 +635,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -648,7 +659,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public linkAccounts(id: any, fk: any, data: any = undefined) { + public linkAccounts(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts/rel/:fk"; @@ -664,7 +675,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onLinkAccounts(id: any) { + public onLinkAccounts(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts/rel/:fk"; @@ -674,6 +685,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -690,7 +702,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public unlinkAccounts(id: any, fk: any) { + public unlinkAccounts(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts/rel/:fk"; @@ -704,7 +716,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onUnlinkAccounts(id: any) { + public onUnlinkAccounts(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts/rel/:fk"; @@ -714,6 +726,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -733,7 +746,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public existsAccounts(id: any, fk: any) { + public existsAccounts(id: any, fk: any): Observable { let method: string = "HEAD"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts/rel/:fk"; @@ -763,7 +776,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public findByIdAdmins(id: any, fk: any) { + public findByIdAdmins(id: any, fk: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins/:fk"; @@ -774,7 +787,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody); - return result.map((instance: Room) => new Room(instance)); + return result; } /** @@ -790,7 +803,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public destroyByIdAdmins(id: any, fk: any) { + public destroyByIdAdmins(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins/:fk"; @@ -804,7 +817,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onDestroyByIdAdmins(id: any) { + public onDestroyByIdAdmins(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins/:fk"; @@ -814,6 +827,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -837,7 +851,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public updateByIdAdmins(id: any, fk: any, data: any = undefined) { + public updateByIdAdmins(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins/:fk"; @@ -853,7 +867,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onUpdateByIdAdmins(id: any) { + public onUpdateByIdAdmins(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins/:fk"; @@ -863,6 +877,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -886,7 +901,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public linkAdmins(id: any, fk: any, data: any = undefined) { + public linkAdmins(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins/rel/:fk"; @@ -902,7 +917,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onLinkAdmins(id: any) { + public onLinkAdmins(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins/rel/:fk"; @@ -912,6 +927,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -928,7 +944,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public unlinkAdmins(id: any, fk: any) { + public unlinkAdmins(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins/rel/:fk"; @@ -942,7 +958,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onUnlinkAdmins(id: any) { + public onUnlinkAdmins(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins/rel/:fk"; @@ -952,6 +968,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -971,7 +988,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public existsAdmins(id: any, fk: any) { + public existsAdmins(id: any, fk: any): Observable { let method: string = "HEAD"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins/rel/:fk"; @@ -1001,7 +1018,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public getMessages(id: any, filter: LoopBackFilter = undefined) { + public getMessages(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages"; @@ -1033,7 +1050,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public createMessages(id: any, data: any = undefined) { + public createMessages(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages"; @@ -1048,7 +1065,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onCreateMessages(id: any) { + public onCreateMessages(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages"; @@ -1058,6 +1075,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1072,7 +1090,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public deleteMessages(id: any) { + public deleteMessages(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages"; @@ -1085,7 +1103,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onDeleteMessages(id: any) { + public onDeleteMessages(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages"; @@ -1095,6 +1113,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1113,7 +1132,7 @@ export class RoomApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public countMessages(id: any, where: any = undefined) { + public countMessages(id: any, where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages/count"; @@ -1143,7 +1162,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public getLikes(id: any, filter: LoopBackFilter = undefined) { + public getLikes(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes"; @@ -1175,7 +1194,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public createLikes(id: any, data: any = undefined) { + public createLikes(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes"; @@ -1190,7 +1209,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onCreateLikes(id: any) { + public onCreateLikes(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes"; @@ -1200,6 +1219,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1214,7 +1234,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public deleteLikes(id: any) { + public deleteLikes(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes"; @@ -1227,7 +1247,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onDeleteLikes(id: any) { + public onDeleteLikes(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes"; @@ -1237,6 +1257,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1255,7 +1276,7 @@ export class RoomApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public countLikes(id: any, where: any = undefined) { + public countLikes(id: any, where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes/count"; @@ -1285,7 +1306,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public getCategories(id: any, filter: LoopBackFilter = undefined) { + public getCategories(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories"; @@ -1317,7 +1338,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public createCategories(id: any, data: any = undefined) { + public createCategories(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories"; @@ -1332,7 +1353,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onCreateCategories(id: any) { + public onCreateCategories(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories"; @@ -1342,6 +1363,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1356,7 +1378,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public deleteCategories(id: any) { + public deleteCategories(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories"; @@ -1369,7 +1391,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onDeleteCategories(id: any) { + public onDeleteCategories(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories"; @@ -1379,6 +1401,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1397,7 +1420,7 @@ export class RoomApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public countCategories(id: any, where: any = undefined) { + public countCategories(id: any, where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories/count"; @@ -1427,7 +1450,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public getAccounts(id: any, filter: LoopBackFilter = undefined) { + public getAccounts(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts"; @@ -1459,7 +1482,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public createAccounts(id: any, data: any = undefined) { + public createAccounts(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts"; @@ -1474,7 +1497,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onCreateAccounts(id: any) { + public onCreateAccounts(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts"; @@ -1484,6 +1507,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1498,7 +1522,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public deleteAccounts(id: any) { + public deleteAccounts(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts"; @@ -1511,7 +1535,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onDeleteAccounts(id: any) { + public onDeleteAccounts(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts"; @@ -1521,6 +1545,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1539,7 +1564,7 @@ export class RoomApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public countAccounts(id: any, where: any = undefined) { + public countAccounts(id: any, where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts/count"; @@ -1569,7 +1594,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public getAdmins(id: any, filter: LoopBackFilter = undefined) { + public getAdmins(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins"; @@ -1601,7 +1626,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public createAdmins(id: any, data: any = undefined) { + public createAdmins(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins"; @@ -1616,7 +1641,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onCreateAdmins(id: any) { + public onCreateAdmins(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins"; @@ -1626,6 +1651,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1640,7 +1666,7 @@ export class RoomApi extends BaseLoopBackApi { * * This method returns no data. */ - public deleteAdmins(id: any) { + public deleteAdmins(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins"; @@ -1653,7 +1679,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onDeleteAdmins(id: any) { + public onDeleteAdmins(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins"; @@ -1663,6 +1689,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1681,7 +1708,7 @@ export class RoomApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public countAdmins(id: any, where: any = undefined) { + public countAdmins(id: any, where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins/count"; @@ -1711,7 +1738,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public create(data: any = undefined) { + public create(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms"; @@ -1724,7 +1751,7 @@ export class RoomApi extends BaseLoopBackApi { return result.map((instance: Room) => new Room(instance)); } - public onCreate() { + public onCreate(): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms"; @@ -1732,7 +1759,8 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); - return result; + + return result.map((instance: Room) => new Room(instance)); } /** @@ -1751,7 +1779,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public upsert(data: any = undefined) { + public upsert(data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms"; @@ -1764,7 +1792,7 @@ export class RoomApi extends BaseLoopBackApi { return result.map((instance: Room) => new Room(instance)); } - public onUpsert() { + public onUpsert(): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms"; @@ -1772,7 +1800,8 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); - return result; + + return result.map((instance: Room) => new Room(instance)); } /** @@ -1791,7 +1820,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public replaceOrCreate(data: any = undefined) { + public replaceOrCreate(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/replaceOrCreate"; @@ -1804,7 +1833,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onReplaceOrCreate() { + public onReplaceOrCreate(): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/replaceOrCreate"; @@ -1812,6 +1841,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1833,7 +1863,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public upsertWithWhere(where: any = undefined, data: any = undefined) { + public upsertWithWhere(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/upsertWithWhere"; @@ -1847,7 +1877,7 @@ export class RoomApi extends BaseLoopBackApi { return result.map((instance: Room) => new Room(instance)); } - public onUpsertWithWhere(where: any = undefined) { + public onUpsertWithWhere(where: any = undefined): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/upsertWithWhere"; @@ -1855,7 +1885,8 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); - return result; + + return result.map((instance: Room) => new Room(instance)); } /** @@ -1871,7 +1902,7 @@ export class RoomApi extends BaseLoopBackApi { * * - `exists` – `{boolean}` - */ - public exists(id: any) { + public exists(id: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/exists"; @@ -1900,7 +1931,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public findById(id: any, filter: LoopBackFilter = undefined) { + public findById(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id"; @@ -1932,7 +1963,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public replaceById(id: any, data: any = undefined) { + public replaceById(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/replace"; @@ -1947,7 +1978,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onReplaceById(id: any) { + public onReplaceById(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/replace"; @@ -1957,6 +1988,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -1974,7 +2006,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public find(filter: LoopBackFilter = undefined) { + public find(filter: LoopBackFilter = undefined): Observable> { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms"; @@ -2002,7 +2034,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public findOne(filter: LoopBackFilter = undefined) { + public findOne(filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/findOne"; @@ -2029,7 +2061,7 @@ export class RoomApi extends BaseLoopBackApi { * * The number of instances updated */ - public updateAll(where: any = undefined, data: any = undefined) { + public updateAll(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/update"; @@ -2043,7 +2075,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onUpdateAll(where: any = undefined) { + public onUpdateAll(where: any = undefined): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/update"; @@ -2051,6 +2083,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -2068,7 +2101,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public deleteById(id: any) { + public deleteById(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id"; @@ -2081,7 +2114,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onDeleteById(id: any) { + public onDeleteById(id: any): Observable { let method: string = "DELETE"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id"; @@ -2091,6 +2124,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -2107,7 +2141,7 @@ export class RoomApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public count(where: any = undefined) { + public count(where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/count"; @@ -2137,7 +2171,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public updateAttributes(id: any, data: any = undefined) { + public updateAttributes(id: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id"; @@ -2152,7 +2186,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onUpdateAttributes(id: any) { + public onUpdateAttributes(id: any): Observable { let method: string = "PUT"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id"; @@ -2162,6 +2196,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -2180,7 +2215,7 @@ export class RoomApi extends BaseLoopBackApi { * * - `changes` – `{ReadableStream}` - */ - public createChangeStream() { + public createChangeStream(): Observable { let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/change-stream"; let subject = new Subject(); @@ -2213,7 +2248,7 @@ export class RoomApi extends BaseLoopBackApi { * * - `greeting` – `{string}` - */ - public greetRoute(a: any = undefined, b: any = undefined, c: any = undefined) { + public greetRoute(a: any = undefined, b: any = undefined, c: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/what/:a/:b/:c"; @@ -2249,7 +2284,7 @@ export class RoomApi extends BaseLoopBackApi { * * - `greeting` – `{string}` - */ - public greetPost(a: any = undefined, b: any = undefined, c: any = undefined) { + public greetPost(a: any = undefined, b: any = undefined, c: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/who"; @@ -2267,7 +2302,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onGreetPost(a: any = undefined, b: any = undefined, c: any = undefined) { + public onGreetPost(a: any = undefined, b: any = undefined, c: any = undefined): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/who"; @@ -2275,6 +2310,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -2297,7 +2333,7 @@ export class RoomApi extends BaseLoopBackApi { * * - `greeting` – `{string}` - */ - public greetGet(a: any = undefined, b: any = undefined, c: any = undefined) { + public greetGet(a: any = undefined, b: any = undefined, c: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/slimshady"; @@ -2329,7 +2365,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public createManyMessages(id: any, data: Array = undefined) { + public createManyMessages(id: any, data: Array = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages"; @@ -2344,7 +2380,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onCreateManyMessages(id: any) { + public onCreateManyMessages(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/messages"; @@ -2354,6 +2390,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -2375,7 +2412,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public createManyLikes(id: any, data: Array = undefined) { + public createManyLikes(id: any, data: Array = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes"; @@ -2390,7 +2427,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onCreateManyLikes(id: any) { + public onCreateManyLikes(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/likes"; @@ -2400,6 +2437,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -2421,7 +2459,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public createManyCategories(id: any, data: Array = undefined) { + public createManyCategories(id: any, data: Array = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories"; @@ -2436,7 +2474,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onCreateManyCategories(id: any) { + public onCreateManyCategories(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/categories"; @@ -2446,6 +2484,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -2467,7 +2506,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public createManyAccounts(id: any, data: Array = undefined) { + public createManyAccounts(id: any, data: Array = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts"; @@ -2482,7 +2521,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onCreateManyAccounts(id: any) { + public onCreateManyAccounts(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/accounts"; @@ -2492,6 +2531,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -2513,7 +2553,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public createManyAdmins(id: any, data: Array = undefined) { + public createManyAdmins(id: any, data: Array = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins"; @@ -2528,7 +2568,7 @@ export class RoomApi extends BaseLoopBackApi { return result; } - public onCreateManyAdmins(id: any) { + public onCreateManyAdmins(id: any): Observable { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms/:id/admins"; @@ -2538,6 +2578,7 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); + ; return result; } @@ -2557,7 +2598,7 @@ export class RoomApi extends BaseLoopBackApi { * This usually means the response is a `Room` object.) * */ - public createMany(data: Array = undefined) { + public createMany(data: Array = undefined): Observable> { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/rooms"; @@ -2572,7 +2613,7 @@ export class RoomApi extends BaseLoopBackApi { ); } - public onCreateMany() { + public onCreateMany(): Observable> { let method: string = "POST"; let url: string = "/" + LoopBackConfig.getApiVersion() + "/rooms"; @@ -2580,7 +2621,10 @@ export class RoomApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody, true); - return result; + ; + return result.map((instances: Array) => + instances.map((instance: Room) => new Room(instance)) + ); } /** diff --git a/tests/angular2/src/app/shared/sdk/services/custom/RoomAccount.ts b/tests/angular2/src/app/shared/sdk/services/custom/RoomAccount.ts index bd277b27..015b3784 100644 --- a/tests/angular2/src/app/shared/sdk/services/custom/RoomAccount.ts +++ b/tests/angular2/src/app/shared/sdk/services/custom/RoomAccount.ts @@ -8,6 +8,7 @@ import { LoopBackFilter, } from '../../models/BaseModels'; import { JSONSearchParams } from '../core/search.params'; import { ErrorHandler } from '../core/error.service'; import { Subject } from 'rxjs/Subject'; +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { RoomAccount } from '../../models/RoomAccount'; import { Account } from '../../models/Account'; @@ -47,7 +48,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public getAccount(id: any, refresh: any = undefined) { + public getAccount(id: any, refresh: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/:id/account"; @@ -77,7 +78,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public getRoom(id: any, refresh: any = undefined) { + public getRoom(id: any, refresh: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/:id/room"; @@ -107,7 +108,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public create(data: any = undefined) { + public create(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts"; @@ -136,7 +137,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public upsert(data: any = undefined) { + public upsert(data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts"; @@ -165,7 +166,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public replaceOrCreate(data: any = undefined) { + public replaceOrCreate(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/replaceOrCreate"; @@ -196,7 +197,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public upsertWithWhere(where: any = undefined, data: any = undefined) { + public upsertWithWhere(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/upsertWithWhere"; @@ -223,7 +224,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * * - `exists` – `{boolean}` - */ - public exists(id: any) { + public exists(id: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/:id/exists"; @@ -252,7 +253,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public findById(id: any, filter: LoopBackFilter = undefined) { + public findById(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/:id"; @@ -284,7 +285,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public replaceById(id: any, data: any = undefined) { + public replaceById(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/:id/replace"; @@ -313,7 +314,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public find(filter: LoopBackFilter = undefined) { + public find(filter: LoopBackFilter = undefined): Observable> { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts"; @@ -341,7 +342,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public findOne(filter: LoopBackFilter = undefined) { + public findOne(filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/findOne"; @@ -368,7 +369,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * * The number of instances updated */ - public updateAll(where: any = undefined, data: any = undefined) { + public updateAll(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/update"; @@ -396,7 +397,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public deleteById(id: any) { + public deleteById(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/:id"; @@ -422,7 +423,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public count(where: any = undefined) { + public count(where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/count"; @@ -452,7 +453,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public updateAttributes(id: any, data: any = undefined) { + public updateAttributes(id: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/:id"; @@ -482,7 +483,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * * - `changes` – `{ReadableStream}` - */ - public createChangeStream() { + public createChangeStream(): Observable { let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts/change-stream"; let subject = new Subject(); @@ -512,7 +513,7 @@ export class RoomAccountApi extends BaseLoopBackApi { * This usually means the response is a `RoomAccount` object.) * */ - public createMany(data: Array = undefined) { + public createMany(data: Array = undefined): Observable> { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/room-accounts"; diff --git a/tests/angular2/src/app/shared/sdk/services/custom/Storage.ts b/tests/angular2/src/app/shared/sdk/services/custom/Storage.ts index 41b5a5c8..d469c2a2 100644 --- a/tests/angular2/src/app/shared/sdk/services/custom/Storage.ts +++ b/tests/angular2/src/app/shared/sdk/services/custom/Storage.ts @@ -8,6 +8,7 @@ import { LoopBackFilter, } from '../../models/BaseModels'; import { JSONSearchParams } from '../core/search.params'; import { ErrorHandler } from '../core/error.service'; import { Subject } from 'rxjs/Subject'; +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { Storage } from '../../models/Storage'; @@ -43,7 +44,7 @@ export class StorageApi extends BaseLoopBackApi { * This usually means the response is a `Storage` object.) * */ - public getContainers() { + public getContainers(): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/storages"; @@ -72,7 +73,7 @@ export class StorageApi extends BaseLoopBackApi { * This usually means the response is a `Storage` object.) * */ - public createContainer(options: any = undefined) { + public createContainer(options: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/storages"; @@ -100,7 +101,7 @@ export class StorageApi extends BaseLoopBackApi { * * - `` – `{}` - */ - public destroyContainer(container: any = undefined) { + public destroyContainer(container: any = undefined): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/storages/:container"; @@ -130,7 +131,7 @@ export class StorageApi extends BaseLoopBackApi { * This usually means the response is a `Storage` object.) * */ - public getContainer(container: any = undefined) { + public getContainer(container: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/storages/:container"; @@ -160,7 +161,7 @@ export class StorageApi extends BaseLoopBackApi { * This usually means the response is a `Storage` object.) * */ - public getFiles(container: any = undefined) { + public getFiles(container: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/storages/:container/files"; @@ -192,7 +193,7 @@ export class StorageApi extends BaseLoopBackApi { * This usually means the response is a `Storage` object.) * */ - public getFile(container: any = undefined, file: any = undefined) { + public getFile(container: any = undefined, file: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/storages/:container/files/:file"; @@ -225,7 +226,7 @@ export class StorageApi extends BaseLoopBackApi { * * - `` – `{}` - */ - public removeFile(container: any = undefined, file: any = undefined) { + public removeFile(container: any = undefined, file: any = undefined): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/storages/:container/files/:file"; @@ -260,7 +261,7 @@ export class StorageApi extends BaseLoopBackApi { * * - `result` – `{object}` - */ - public upload(req: any = undefined, res: any = undefined) { + public upload(req: any = undefined, res: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/storages/:container/upload"; @@ -295,7 +296,7 @@ export class StorageApi extends BaseLoopBackApi { * * This method returns no data. */ - public download(container: any = undefined, file: any = undefined, req: any = undefined, res: any = undefined) { + public download(container: any = undefined, file: any = undefined, req: any = undefined, res: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/storages/:container/download/:file"; diff --git a/tests/angular2/src/app/shared/sdk/services/custom/User.ts b/tests/angular2/src/app/shared/sdk/services/custom/User.ts index 8c4ac5dd..faaf83ee 100644 --- a/tests/angular2/src/app/shared/sdk/services/custom/User.ts +++ b/tests/angular2/src/app/shared/sdk/services/custom/User.ts @@ -8,6 +8,7 @@ import { LoopBackFilter, SDKToken, AccessToken } from '../../models/BaseModels'; import { JSONSearchParams } from '../core/search.params'; import { ErrorHandler } from '../core/error.service'; import { Subject } from 'rxjs/Subject'; +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { User } from '../../models/User'; @@ -45,7 +46,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public findByIdAccessTokens(id: any, fk: any) { + public findByIdAccessTokens(id: any, fk: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id/accessTokens/:fk"; @@ -56,7 +57,7 @@ export class UserApi extends BaseLoopBackApi { let postBody: any = {}; let urlParams: any = {}; let result = this.request(method, url, routeParams, urlParams, postBody); - return result.map((instance: User) => new User(instance)); + return result; } /** @@ -72,7 +73,7 @@ export class UserApi extends BaseLoopBackApi { * * This method returns no data. */ - public destroyByIdAccessTokens(id: any, fk: any) { + public destroyByIdAccessTokens(id: any, fk: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id/accessTokens/:fk"; @@ -106,7 +107,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public updateByIdAccessTokens(id: any, fk: any, data: any = undefined) { + public updateByIdAccessTokens(id: any, fk: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id/accessTokens/:fk"; @@ -138,7 +139,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public getAccessTokens(id: any, filter: LoopBackFilter = undefined) { + public getAccessTokens(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id/accessTokens"; @@ -170,7 +171,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public createAccessTokens(id: any, data: any = undefined) { + public createAccessTokens(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id/accessTokens"; @@ -196,7 +197,7 @@ export class UserApi extends BaseLoopBackApi { * * This method returns no data. */ - public deleteAccessTokens(id: any) { + public deleteAccessTokens(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id/accessTokens"; @@ -224,7 +225,7 @@ export class UserApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public countAccessTokens(id: any, where: any = undefined) { + public countAccessTokens(id: any, where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id/accessTokens/count"; @@ -254,7 +255,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public create(data: any = undefined) { + public create(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users"; @@ -283,7 +284,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public upsert(data: any = undefined) { + public upsert(data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users"; @@ -312,7 +313,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public replaceOrCreate(data: any = undefined) { + public replaceOrCreate(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/replaceOrCreate"; @@ -343,7 +344,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public upsertWithWhere(where: any = undefined, data: any = undefined) { + public upsertWithWhere(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/upsertWithWhere"; @@ -370,7 +371,7 @@ export class UserApi extends BaseLoopBackApi { * * - `exists` – `{boolean}` - */ - public exists(id: any) { + public exists(id: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id/exists"; @@ -399,7 +400,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public findById(id: any, filter: LoopBackFilter = undefined) { + public findById(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id"; @@ -431,7 +432,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public replaceById(id: any, data: any = undefined) { + public replaceById(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id/replace"; @@ -460,7 +461,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public find(filter: LoopBackFilter = undefined) { + public find(filter: LoopBackFilter = undefined): Observable> { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users"; @@ -488,7 +489,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public findOne(filter: LoopBackFilter = undefined) { + public findOne(filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/findOne"; @@ -515,7 +516,7 @@ export class UserApi extends BaseLoopBackApi { * * The number of instances updated */ - public updateAll(where: any = undefined, data: any = undefined) { + public updateAll(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/update"; @@ -543,7 +544,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public deleteById(id: any) { + public deleteById(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id"; @@ -569,7 +570,7 @@ export class UserApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public count(where: any = undefined) { + public count(where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/count"; @@ -599,7 +600,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public updateAttributes(id: any, data: any = undefined) { + public updateAttributes(id: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id"; @@ -629,7 +630,7 @@ export class UserApi extends BaseLoopBackApi { * * - `changes` – `{ReadableStream}` - */ - public createChangeStream() { + public createChangeStream(): Observable { let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/change-stream"; let subject = new Subject(); @@ -668,7 +669,7 @@ export class UserApi extends BaseLoopBackApi { * * */ - public login(credentials: any, include: any = 'user', rememberMe: boolean = true) { + public login(credentials: any, include: any = 'user', rememberMe: boolean = true): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/login"; @@ -704,7 +705,7 @@ export class UserApi extends BaseLoopBackApi { * * This method returns no data. */ - public logout() { + public logout(): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/logout"; @@ -732,7 +733,7 @@ export class UserApi extends BaseLoopBackApi { * * This method returns no data. */ - public confirm(uid: any, token: any, redirect: any = undefined) { + public confirm(uid: any, token: any, redirect: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/confirm"; @@ -760,7 +761,7 @@ export class UserApi extends BaseLoopBackApi { * * This method returns no data. */ - public resetPassword(options: any) { + public resetPassword(options: any): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/reset"; @@ -791,7 +792,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public createManyAccessTokens(id: any, data: Array = undefined) { + public createManyAccessTokens(id: any, data: Array = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users/:id/accessTokens"; @@ -822,7 +823,7 @@ export class UserApi extends BaseLoopBackApi { * This usually means the response is a `User` object.) * */ - public createMany(data: Array = undefined) { + public createMany(data: Array = undefined): Observable> { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/Users"; diff --git a/tests/angular2/src/app/shared/sdk/services/custom/UserCredential.ts b/tests/angular2/src/app/shared/sdk/services/custom/UserCredential.ts index bdef0325..71bc4b6b 100644 --- a/tests/angular2/src/app/shared/sdk/services/custom/UserCredential.ts +++ b/tests/angular2/src/app/shared/sdk/services/custom/UserCredential.ts @@ -8,6 +8,7 @@ import { LoopBackFilter, } from '../../models/BaseModels'; import { JSONSearchParams } from '../core/search.params'; import { ErrorHandler } from '../core/error.service'; import { Subject } from 'rxjs/Subject'; +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { UserCredential } from '../../models/UserCredential'; @@ -45,7 +46,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * This usually means the response is a `UserCredential` object.) * */ - public create(data: any = undefined) { + public create(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials"; @@ -74,7 +75,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * This usually means the response is a `UserCredential` object.) * */ - public upsert(data: any = undefined) { + public upsert(data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials"; @@ -103,7 +104,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * This usually means the response is a `UserCredential` object.) * */ - public replaceOrCreate(data: any = undefined) { + public replaceOrCreate(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials/replaceOrCreate"; @@ -134,7 +135,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * This usually means the response is a `UserCredential` object.) * */ - public upsertWithWhere(where: any = undefined, data: any = undefined) { + public upsertWithWhere(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials/upsertWithWhere"; @@ -161,7 +162,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * * - `exists` – `{boolean}` - */ - public exists(id: any) { + public exists(id: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials/:id/exists"; @@ -190,7 +191,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * This usually means the response is a `UserCredential` object.) * */ - public findById(id: any, filter: LoopBackFilter = undefined) { + public findById(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials/:id"; @@ -222,7 +223,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * This usually means the response is a `UserCredential` object.) * */ - public replaceById(id: any, data: any = undefined) { + public replaceById(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials/:id/replace"; @@ -251,7 +252,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * This usually means the response is a `UserCredential` object.) * */ - public find(filter: LoopBackFilter = undefined) { + public find(filter: LoopBackFilter = undefined): Observable> { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials"; @@ -279,7 +280,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * This usually means the response is a `UserCredential` object.) * */ - public findOne(filter: LoopBackFilter = undefined) { + public findOne(filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials/findOne"; @@ -306,7 +307,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * * The number of instances updated */ - public updateAll(where: any = undefined, data: any = undefined) { + public updateAll(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials/update"; @@ -334,7 +335,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * This usually means the response is a `UserCredential` object.) * */ - public deleteById(id: any) { + public deleteById(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials/:id"; @@ -360,7 +361,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public count(where: any = undefined) { + public count(where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials/count"; @@ -390,7 +391,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * This usually means the response is a `UserCredential` object.) * */ - public updateAttributes(id: any, data: any = undefined) { + public updateAttributes(id: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials/:id"; @@ -420,7 +421,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * * - `changes` – `{ReadableStream}` - */ - public createChangeStream() { + public createChangeStream(): Observable { let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials/change-stream"; let subject = new Subject(); @@ -450,7 +451,7 @@ export class UserCredentialApi extends BaseLoopBackApi { * This usually means the response is a `UserCredential` object.) * */ - public createMany(data: Array = undefined) { + public createMany(data: Array = undefined): Observable> { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserCredentials"; diff --git a/tests/angular2/src/app/shared/sdk/services/custom/UserIdentity.ts b/tests/angular2/src/app/shared/sdk/services/custom/UserIdentity.ts index 8367ad01..62f7280a 100644 --- a/tests/angular2/src/app/shared/sdk/services/custom/UserIdentity.ts +++ b/tests/angular2/src/app/shared/sdk/services/custom/UserIdentity.ts @@ -8,6 +8,7 @@ import { LoopBackFilter, } from '../../models/BaseModels'; import { JSONSearchParams } from '../core/search.params'; import { ErrorHandler } from '../core/error.service'; import { Subject } from 'rxjs/Subject'; +import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { UserIdentity } from '../../models/UserIdentity'; import { User } from '../../models/User'; @@ -46,7 +47,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public getUser(id: any, refresh: any = undefined) { + public getUser(id: any, refresh: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/:id/user"; @@ -76,7 +77,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public create(data: any = undefined) { + public create(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities"; @@ -105,7 +106,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public upsert(data: any = undefined) { + public upsert(data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities"; @@ -134,7 +135,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public replaceOrCreate(data: any = undefined) { + public replaceOrCreate(data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/replaceOrCreate"; @@ -165,7 +166,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public upsertWithWhere(where: any = undefined, data: any = undefined) { + public upsertWithWhere(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/upsertWithWhere"; @@ -192,7 +193,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * * - `exists` – `{boolean}` - */ - public exists(id: any) { + public exists(id: any): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/:id/exists"; @@ -221,7 +222,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public findById(id: any, filter: LoopBackFilter = undefined) { + public findById(id: any, filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/:id"; @@ -253,7 +254,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public replaceById(id: any, data: any = undefined) { + public replaceById(id: any, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/:id/replace"; @@ -282,7 +283,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public find(filter: LoopBackFilter = undefined) { + public find(filter: LoopBackFilter = undefined): Observable> { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities"; @@ -310,7 +311,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public findOne(filter: LoopBackFilter = undefined) { + public findOne(filter: LoopBackFilter = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/findOne"; @@ -337,7 +338,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * * The number of instances updated */ - public updateAll(where: any = undefined, data: any = undefined) { + public updateAll(where: any = undefined, data: any = undefined): Observable { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/update"; @@ -365,7 +366,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public deleteById(id: any) { + public deleteById(id: any): Observable { let method: string = "DELETE"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/:id"; @@ -391,7 +392,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * * - `count` – `{number}` - */ - public count(where: any = undefined) { + public count(where: any = undefined): Observable { let method: string = "GET"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/count"; @@ -421,7 +422,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public updateAttributes(id: any, data: any = undefined) { + public updateAttributes(id: any, data: any = undefined): Observable { let method: string = "PUT"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/:id"; @@ -451,7 +452,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * * - `changes` – `{ReadableStream}` - */ - public createChangeStream() { + public createChangeStream(): Observable { let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities/change-stream"; let subject = new Subject(); @@ -481,7 +482,7 @@ export class UserIdentityApi extends BaseLoopBackApi { * This usually means the response is a `UserIdentity` object.) * */ - public createMany(data: Array = undefined) { + public createMany(data: Array = undefined): Observable> { let method: string = "POST"; let url: string = LoopBackConfig.getPath() + "/" + LoopBackConfig.getApiVersion() + "/UserIdentities";