@manticore-labs/nest 0.0.13 → 0.0.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/main/index.d.ts +1 -0
- package/build/main/lib/interfaces-util/find-where-relations.d.ts +8 -0
- package/build/main/lib/interfaces-util/find-where-relations.js +3 -0
- package/build/main/lib/principal.service.d.ts +2 -1
- package/build/main/lib/principal.service.js +34 -5
- package/build/module/index.d.ts +1 -0
- package/build/module/lib/interfaces-util/find-where-relations.d.ts +8 -0
- package/build/module/lib/interfaces-util/find-where-relations.js +1 -0
- package/build/module/lib/principal.service.d.ts +2 -1
- package/build/module/lib/principal.service.js +34 -5
- package/package.json +1 -1
package/build/main/index.d.ts
CHANGED
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluZC13aGVyZS1yZWxhdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbGliL2ludGVyZmFjZXMtdXRpbC9maW5kLXdoZXJlLXJlbGF0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
|
|
@@ -6,6 +6,7 @@ import { QueryRunner } from 'typeorm/query-runner/QueryRunner';
|
|
|
6
6
|
import { SelectQueryBuilder } from 'typeorm/query-builder/SelectQueryBuilder';
|
|
7
7
|
import { DeleteResult } from 'typeorm/query-builder/result/DeleteResult';
|
|
8
8
|
import { Observable } from 'rxjs';
|
|
9
|
+
import { FindWhereRelations } from './interfaces-util/find-where-relations';
|
|
9
10
|
export declare class PrincipalService<T, G, F> {
|
|
10
11
|
protected readonly repository: Repository<T>;
|
|
11
12
|
private Entidad?;
|
|
@@ -25,7 +26,7 @@ export declare class PrincipalService<T, G, F> {
|
|
|
25
26
|
delete(criterio?: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | FindConditions<T>, esSocket?: boolean): Observable<ErrorServicioInterface | DeleteResult>;
|
|
26
27
|
deleteMany(criterio?: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | FindConditions<T>): Promise<DeleteResult>;
|
|
27
28
|
queryBuilder(alias?: string, queryRunner?: QueryRunner): SelectQueryBuilder<T>;
|
|
28
|
-
findWhereOr(camposABuscar: any[], skip: number, take: number): Promise<{}>;
|
|
29
|
+
findWhereOr(camposABuscar: any[], skip: number, take: number, relations?: FindWhereRelations[]): Promise<{}>;
|
|
29
30
|
}
|
|
30
31
|
export declare function devolverRespuestaSiExiste(encontroRegistro: any, esSocket?: boolean, esActualizado?: boolean, datosAActualizar?: any, contexto?: any): Promise<{}>;
|
|
31
32
|
export interface ErrorServicioInterface {
|
|
@@ -98,7 +98,7 @@ let PrincipalService = class PrincipalService {
|
|
|
98
98
|
queryBuilder(alias, queryRunner) {
|
|
99
99
|
return this.repository.createQueryBuilder(alias, queryRunner);
|
|
100
100
|
}
|
|
101
|
-
async findWhereOr(camposABuscar, skip, take) {
|
|
101
|
+
async findWhereOr(camposABuscar, skip, take, relations) {
|
|
102
102
|
if (this.Entidad && this.nombreRepositorio) {
|
|
103
103
|
const entidad = new this.Entidad();
|
|
104
104
|
const atributos = Object
|
|
@@ -121,9 +121,38 @@ let PrincipalService = class PrincipalService {
|
|
|
121
121
|
objeto[campo.campo] = campo.valor;
|
|
122
122
|
}
|
|
123
123
|
});
|
|
124
|
-
|
|
124
|
+
let respuesta = await typeorm_1.getRepository(this.Entidad, this.nombreRepositorio)
|
|
125
125
|
.createQueryBuilder('entidad')
|
|
126
|
-
.where(query, objeto)
|
|
126
|
+
.where(query, objeto);
|
|
127
|
+
if (relations) {
|
|
128
|
+
relations.forEach((relacion) => {
|
|
129
|
+
const parametros = ['entidad.' + relacion.entidad, relacion.entidad];
|
|
130
|
+
if (relacion.query) {
|
|
131
|
+
let queryRelacion = '';
|
|
132
|
+
const objetoRelacion = {};
|
|
133
|
+
relacion.query
|
|
134
|
+
.forEach((campoRelacion) => {
|
|
135
|
+
if (queryRelacion === '') {
|
|
136
|
+
queryRelacion = queryRelacion + `${relacion.key}.${campoRelacion.campo} = :${campoRelacion.campo}`;
|
|
137
|
+
objetoRelacion[campoRelacion.campo] = campoRelacion.valor;
|
|
138
|
+
}
|
|
139
|
+
else {
|
|
140
|
+
queryRelacion = queryRelacion + ` AND ${relacion.key}.${campoRelacion.campo} = :${campoRelacion.campo}`;
|
|
141
|
+
objetoRelacion[campoRelacion.campo] = campoRelacion.valor;
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
parametros.push(queryRelacion);
|
|
145
|
+
parametros.push(objetoRelacion);
|
|
146
|
+
let innerJoin = respuesta.innerJoin;
|
|
147
|
+
respuesta = innerJoin(...parametros);
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
let innerJoin = respuesta.innerJoin;
|
|
151
|
+
respuesta = innerJoin(...parametros);
|
|
152
|
+
}
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
respuesta
|
|
127
156
|
.skip(skip)
|
|
128
157
|
.take(take)
|
|
129
158
|
.getManyAndCount();
|
|
@@ -146,7 +175,7 @@ function devolverRespuestaSiExiste(encontroRegistro, esSocket = false, esActuali
|
|
|
146
175
|
return new Promise((resolve, reject) => {
|
|
147
176
|
if (encontroRegistro) {
|
|
148
177
|
if (esActualizado) {
|
|
149
|
-
contexto.update(encontroRegistro
|
|
178
|
+
contexto.update(encontroRegistro, datosAActualizar)
|
|
150
179
|
.then(() => {
|
|
151
180
|
if (esActualizado) {
|
|
152
181
|
Object
|
|
@@ -174,4 +203,4 @@ function devolverRespuestaSiExiste(encontroRegistro, esSocket = false, esActuali
|
|
|
174
203
|
});
|
|
175
204
|
}
|
|
176
205
|
exports.devolverRespuestaSiExiste = devolverRespuestaSiExiste;
|
|
177
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
206
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"principal.service.js","sourceRoot":"","sources":["../../../src/lib/principal.service.ts"],"names":[],"mappings":"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"}
|
package/build/module/index.d.ts
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluZC13aGVyZS1yZWxhdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbGliL2ludGVyZmFjZXMtdXRpbC9maW5kLXdoZXJlLXJlbGF0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
|
|
@@ -6,6 +6,7 @@ import { QueryRunner } from 'typeorm/query-runner/QueryRunner';
|
|
|
6
6
|
import { SelectQueryBuilder } from 'typeorm/query-builder/SelectQueryBuilder';
|
|
7
7
|
import { DeleteResult } from 'typeorm/query-builder/result/DeleteResult';
|
|
8
8
|
import { Observable } from 'rxjs';
|
|
9
|
+
import { FindWhereRelations } from './interfaces-util/find-where-relations';
|
|
9
10
|
export declare class PrincipalService<T, G, F> {
|
|
10
11
|
protected readonly repository: Repository<T>;
|
|
11
12
|
private Entidad?;
|
|
@@ -25,7 +26,7 @@ export declare class PrincipalService<T, G, F> {
|
|
|
25
26
|
delete(criterio?: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | FindConditions<T>, esSocket?: boolean): Observable<ErrorServicioInterface | DeleteResult>;
|
|
26
27
|
deleteMany(criterio?: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | FindConditions<T>): Promise<DeleteResult>;
|
|
27
28
|
queryBuilder(alias?: string, queryRunner?: QueryRunner): SelectQueryBuilder<T>;
|
|
28
|
-
findWhereOr(camposABuscar: any[], skip: number, take: number): Promise<{}>;
|
|
29
|
+
findWhereOr(camposABuscar: any[], skip: number, take: number, relations?: FindWhereRelations[]): Promise<{}>;
|
|
29
30
|
}
|
|
30
31
|
export declare function devolverRespuestaSiExiste(encontroRegistro: any, esSocket?: boolean, esActualizado?: boolean, datosAActualizar?: any, contexto?: any): Promise<{}>;
|
|
31
32
|
export interface ErrorServicioInterface {
|
|
@@ -96,7 +96,7 @@ let PrincipalService = class PrincipalService {
|
|
|
96
96
|
queryBuilder(alias, queryRunner) {
|
|
97
97
|
return this.repository.createQueryBuilder(alias, queryRunner);
|
|
98
98
|
}
|
|
99
|
-
async findWhereOr(camposABuscar, skip, take) {
|
|
99
|
+
async findWhereOr(camposABuscar, skip, take, relations) {
|
|
100
100
|
if (this.Entidad && this.nombreRepositorio) {
|
|
101
101
|
const entidad = new this.Entidad();
|
|
102
102
|
const atributos = Object
|
|
@@ -119,9 +119,38 @@ let PrincipalService = class PrincipalService {
|
|
|
119
119
|
objeto[campo.campo] = campo.valor;
|
|
120
120
|
}
|
|
121
121
|
});
|
|
122
|
-
|
|
122
|
+
let respuesta = await getRepository(this.Entidad, this.nombreRepositorio)
|
|
123
123
|
.createQueryBuilder('entidad')
|
|
124
|
-
.where(query, objeto)
|
|
124
|
+
.where(query, objeto);
|
|
125
|
+
if (relations) {
|
|
126
|
+
relations.forEach((relacion) => {
|
|
127
|
+
const parametros = ['entidad.' + relacion.entidad, relacion.entidad];
|
|
128
|
+
if (relacion.query) {
|
|
129
|
+
let queryRelacion = '';
|
|
130
|
+
const objetoRelacion = {};
|
|
131
|
+
relacion.query
|
|
132
|
+
.forEach((campoRelacion) => {
|
|
133
|
+
if (queryRelacion === '') {
|
|
134
|
+
queryRelacion = queryRelacion + `${relacion.key}.${campoRelacion.campo} = :${campoRelacion.campo}`;
|
|
135
|
+
objetoRelacion[campoRelacion.campo] = campoRelacion.valor;
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
queryRelacion = queryRelacion + ` AND ${relacion.key}.${campoRelacion.campo} = :${campoRelacion.campo}`;
|
|
139
|
+
objetoRelacion[campoRelacion.campo] = campoRelacion.valor;
|
|
140
|
+
}
|
|
141
|
+
});
|
|
142
|
+
parametros.push(queryRelacion);
|
|
143
|
+
parametros.push(objetoRelacion);
|
|
144
|
+
let innerJoin = respuesta.innerJoin;
|
|
145
|
+
respuesta = innerJoin(...parametros);
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
let innerJoin = respuesta.innerJoin;
|
|
149
|
+
respuesta = innerJoin(...parametros);
|
|
150
|
+
}
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
respuesta
|
|
125
154
|
.skip(skip)
|
|
126
155
|
.take(take)
|
|
127
156
|
.getManyAndCount();
|
|
@@ -144,7 +173,7 @@ export function devolverRespuestaSiExiste(encontroRegistro, esSocket = false, es
|
|
|
144
173
|
return new Promise((resolve, reject) => {
|
|
145
174
|
if (encontroRegistro) {
|
|
146
175
|
if (esActualizado) {
|
|
147
|
-
contexto.update(encontroRegistro
|
|
176
|
+
contexto.update(encontroRegistro, datosAActualizar)
|
|
148
177
|
.then(() => {
|
|
149
178
|
if (esActualizado) {
|
|
150
179
|
Object
|
|
@@ -171,4 +200,4 @@ export function devolverRespuestaSiExiste(encontroRegistro, esSocket = false, es
|
|
|
171
200
|
}
|
|
172
201
|
});
|
|
173
202
|
}
|
|
174
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
203
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"principal.service.js","sourceRoot":"","sources":["../../../src/lib/principal.service.ts"],"names":[],"mappings":"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"}
|