for single and queries that are not dynamic queries.

This commit is contained in:
David Lebee
2021-08-18 01:04:22 -04:00
parent 2485bdb835
commit d2677a896d
7 changed files with 185 additions and 11 deletions
@@ -0,0 +1,107 @@
import { HttpClient } from "@angular/common/http";
import { IQueryCriteria, IQueryExecutionGroupResult, IQueryExecutionResult, IQueryExecutionResultPaging } from "@poweredsoft/data";
import { Observable, of } from "rxjs";
import { map, switchMap } from "rxjs/operators";
import { BaseHttpDataSourceOptionsBuilder } from "./BaseHttpDataSourceOptionsBuilder";
export class ListDataSourceOptionsBuilder<TQuery, TModel, TKey>
extends BaseHttpDataSourceOptionsBuilder<TModel, TKey>
{
private _beforeRead: (query: IQueryCriteria) => Observable<TQuery>;
constructor(http: HttpClient) {
super(http);
}
public beforeRead(beforeRead: (query: IQueryCriteria) => Observable<TQuery>) {
this._beforeRead = beforeRead;
return this;
}
public queryUrlWithGet(url: string) {
this._query = {
adapter: {
handle: (query: IQueryCriteria) => {
const finalBeforeRead = this._beforeRead || ((_: IQueryCriteria) => of(<TQuery>{}));
return finalBeforeRead(query)
.pipe(
switchMap(finalQuery => {
return this.http.get<TModel[]>(url, {
params: this.convertToParams(finalQuery)
}).pipe(
map(result => {
return <IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>
{
totalRecords: result.length,
data: result
};
})
)
})
);
}
}
}
return this;
}
protected convertToParams(finalQuery: TQuery)
{
return Object.keys(finalQuery).reduce((prev, key) => {
prev[key] = finalQuery[key];
return prev;
}, {} as { [param: string]: string | string[]; });
}
public queryUrl(url: string) {
this._query = {
adapter: {
handle: (query: IQueryCriteria) => {
const finalBeforeRead = this._beforeRead || ((_: IQueryCriteria) => of(<TQuery>{}));
return finalBeforeRead(query)
.pipe(
switchMap(finalQuery => {
return this.http.post<TModel[]>(url, finalQuery).pipe(
map(result => {
return <IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>
{
totalRecords: result.length,
data: result
};
})
)
})
);
}
}
}
return this;
}
public queryHandler(queryHandler: (query: IQueryCriteria) => Observable<TModel[]>) {
this._query = {
adapter: {
handle: (query: TQuery) => {
const finalBeforeRead = this._beforeRead || (t => of({}));
return finalBeforeRead(query)
.pipe(
switchMap(finalQuery => {
return queryHandler(finalQuery).pipe(
map(result => {
return <IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>{
totalRecords: result.length,
data: result
};
})
)
})
);
}
}
}
return this;
}
}
@@ -1,5 +1,4 @@
import { HttpClient, HttpResponse } from "@angular/common/http";
import { Query } from "@angular/core";
import { HttpClient } from "@angular/common/http";
import { IQueryCriteria, IQueryExecutionGroupResult, IQueryExecutionResult, IQueryExecutionResultPaging } from "@poweredsoft/data";
import { Observable, of } from "rxjs";
import { map, switchMap } from "rxjs/operators";
@@ -14,6 +13,11 @@ export class SingleDataSourceOptionsBuilder<TQuery, TModel, TKey>
super(http);
}
public beforeRead(beforeRead: (query: IQueryCriteria) => Observable<TQuery>) {
this._beforeRead = beforeRead;
return this;
}
public queryUrlWithGet(url: string) {
this._query = {
adapter: {
@@ -50,7 +54,7 @@ export class SingleDataSourceOptionsBuilder<TQuery, TModel, TKey>
}, {} as { [param: string]: string | string[]; });
}
public queryPostUrl(url: string) {
public queryUrl(url: string) {
this._query = {
adapter: {
handle: (query: IQueryCriteria) => {
@@ -1,6 +1,8 @@
import { Injectable } from "@angular/core";
import { HttpClient } from '@angular/common/http';
import { HttpDataSourceOptionsBuilder } from "./HttpDataSourceBuilder";
import { SingleDataSourceOptionsBuilder } from "./SingleObjectDataSourceBuilder";
import { ListDataSourceOptionsBuilder } from "./ListDataSourceBuilder";
@Injectable({
@@ -13,4 +15,12 @@ export class HttpDataSourceService {
builder<TModel, TKey>() {
return new HttpDataSourceOptionsBuilder<TModel, TKey>(this.http);
}
singleBuilder<TQuery, TModel, TKey>() {
return new SingleDataSourceOptionsBuilder<TQuery, TModel, TKey>(this.http);
}
listBuilder<TQuery, TModel, TKey>() {
return new ListDataSourceOptionsBuilder<TQuery, TModel, TKey>(this.http);
}
}