@bearei/server-common 0.0.145 → 0.0.146
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/dist/base/base.service.js +5 -5
- package/dist/base/base.service.js.map +1 -1
- package/dist/external/external.service.d.ts +2 -2
- package/dist/external/external.service.js +4 -4
- package/dist/external/external.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -127,13 +127,13 @@ let BaseService = class BaseService {
|
|
|
127
127
|
};
|
|
128
128
|
}
|
|
129
129
|
find({ findOptions, findManyOptions = {} }) {
|
|
130
|
-
const { count = false, createdAtRanges, ids, order = 'ASC', page = 1, size = 10, ...
|
|
130
|
+
const { count = false, createdAtRanges, ids, order = 'ASC', page = 1, size = 10, ...restFindOptions } = findOptions;
|
|
131
131
|
const { withDeleted = false, alias, orderByField = 'createdAt', distinctOnFields } = findManyOptions;
|
|
132
132
|
const isCount = count && page === 1;
|
|
133
133
|
const limit = size;
|
|
134
134
|
const offset = (page - 1) * size;
|
|
135
135
|
const where = {
|
|
136
|
-
...Object.entries(
|
|
136
|
+
...Object.entries(restFindOptions).reduce((accumulator, [key, value]) => typeof value !== 'undefined' ? { ...accumulator, [key]: value } : accumulator, {}),
|
|
137
137
|
...(ids && { id: (0, typeorm_1.In)(ids) }),
|
|
138
138
|
...(createdAtRanges && {
|
|
139
139
|
createdAt: (0, typeorm_1.Between)(createdAtRanges[0], createdAtRanges[1])
|
|
@@ -170,7 +170,7 @@ let BaseService = class BaseService {
|
|
|
170
170
|
findQueryBuilder.where(where).limit(limit).offset(offset).getMany(),
|
|
171
171
|
isCount ?
|
|
172
172
|
this.count({
|
|
173
|
-
findOptions: { createdAtRanges, ids
|
|
173
|
+
findOptions: { ...restFindOptions, createdAtRanges, ids },
|
|
174
174
|
findManyOptions
|
|
175
175
|
})(repository)
|
|
176
176
|
: Promise.resolve({ count: undefined })
|
|
@@ -234,7 +234,7 @@ let BaseService = class BaseService {
|
|
|
234
234
|
};
|
|
235
235
|
}
|
|
236
236
|
updateAssociation({ enabledLog = true, entityIds: rawEntityIds, findOptions, headers, serviceName, updateEntityOptions = {} }) {
|
|
237
|
-
const { size: _, ...
|
|
237
|
+
const { size: _, ...restFindOptions } = findOptions;
|
|
238
238
|
const entityIdsSet = new Set(rawEntityIds);
|
|
239
239
|
const entityIds = [...entityIdsSet];
|
|
240
240
|
return (associationKey) => {
|
|
@@ -265,7 +265,7 @@ let BaseService = class BaseService {
|
|
|
265
265
|
...accumulator,
|
|
266
266
|
repository.create({
|
|
267
267
|
...updateEntityOptions[id],
|
|
268
|
-
...
|
|
268
|
+
...restFindOptions,
|
|
269
269
|
[associationKey]: id
|
|
270
270
|
})
|
|
271
271
|
]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../src/base/base.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../src/base/base.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,6 @@ export declare class ExternalService {
|
|
|
10
10
|
constructor(configService: ConfigService, httpService: HttpService, jwtService: JWTService);
|
|
11
11
|
authenticationUserPermission(headers: RequestHeaders): (options: AuthenticationExternalPermissionOptions) => Promise<any>;
|
|
12
12
|
authenticationUserSubscription(headers: RequestHeaders): (options: AuthenticationExternalSubscriptionOptions) => Promise<AuthenticationExternalSubscriptionResult>;
|
|
13
|
-
createActionLog(headers: RequestHeaders): ({ action, serviceName, ...
|
|
14
|
-
request({ async, baseURL, headers, method, params, path, serviceName, timeout, version, ...
|
|
13
|
+
createActionLog(headers: RequestHeaders): ({ action, serviceName, ...restOptions }: CreateExternalActionLogOptions) => Promise<void>;
|
|
14
|
+
request({ async, baseURL, headers, method, params, path, serviceName, timeout, version, ...restOptions }: RequestOptions): Promise<any>;
|
|
15
15
|
}
|
|
@@ -49,14 +49,14 @@ let ExternalService = class ExternalService {
|
|
|
49
49
|
};
|
|
50
50
|
}
|
|
51
51
|
createActionLog(headers) {
|
|
52
|
-
return async ({ action, serviceName, ...
|
|
52
|
+
return async ({ action, serviceName, ...restOptions }) => {
|
|
53
53
|
await this.request({
|
|
54
54
|
async: process.env.NODE_ENV !== 'local',
|
|
55
55
|
method: 'POST',
|
|
56
56
|
path: '/action-logs',
|
|
57
57
|
serviceName: 'bearei-log',
|
|
58
58
|
data: {
|
|
59
|
-
...
|
|
59
|
+
...restOptions,
|
|
60
60
|
action,
|
|
61
61
|
apiName: `${action}:${serviceName}`,
|
|
62
62
|
client: headers['x-ei-client'],
|
|
@@ -70,7 +70,7 @@ let ExternalService = class ExternalService {
|
|
|
70
70
|
});
|
|
71
71
|
};
|
|
72
72
|
}
|
|
73
|
-
async request({ async = false, baseURL, headers, method = 'GET', params, path = '/', serviceName, timeout, version, ...
|
|
73
|
+
async request({ async = false, baseURL, headers, method = 'GET', params, path = '/', serviceName, timeout, version, ...restOptions }) {
|
|
74
74
|
const subject = await (0, utils_1.sign)(10)({
|
|
75
75
|
accessKey: this.configService.get('service.accessKey'),
|
|
76
76
|
secretKey: this.configService.get('service.secretKey'),
|
|
@@ -86,7 +86,7 @@ let ExternalService = class ExternalService {
|
|
|
86
86
|
const url = `/${serviceName}/${version ?? this.configService.get('apiService.version') ?? 'v1'}${path}`;
|
|
87
87
|
return (0, rxjs_1.firstValueFrom)(this.httpService
|
|
88
88
|
.request({
|
|
89
|
-
...
|
|
89
|
+
...restOptions,
|
|
90
90
|
...(params && { params: handleParams(params) }),
|
|
91
91
|
adapter: 'fetch',
|
|
92
92
|
baseURL: baseURL ?? this.configService.get('apiService.url'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AACzC,2CAAyC;AACzC,2CAA4C;AAC5C,+BAA+C;AAC/C,oDAA0D;AAC1D,gCAAiC;AACjC,oCAA6C;AAUtC,IAAM,eAAe,GAArB,MAAM,eAAe;IAEK;IACA;IACA;IAHzB,YACyB,aAA4B,EAC5B,WAAwB,EACxB,UAAsB;QAFtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,eAAU,GAAV,UAAU,CAAY;IAC5C,CAAC;IAEJ,4BAA4B,CAAC,OAAuB;QAC5C,OAAO,KAAK,EAAE,OAAgD,EAAE,EAAE;YAC1D,OAAO,IAAI,CAAC,OAAO,CAAC;gBACZ,OAAO;gBACP,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,OAAO;gBACf,IAAI,EAAE,mCAAmC;gBACzC,WAAW,EAAE,aAAa;aACjC,CAAC,CAAA;QACV,CAAC,CAAA;IACT,CAAC;IAED,8BAA8B,CAAC,OAAuB;QAC9C,OAAO,KAAK,EACJ,OAAkD,EACL,EAAE;YAC/C,OAAO,IAAI,CAAC,OAAO,CAAC;gBACZ,OAAO;gBACP,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,OAAO;gBACf,IAAI,EAAE,qCAAqC;gBAC3C,WAAW,EAAE,aAAa;aACjC,CAAC,CAAA;QACV,CAAC,CAAA;IACT,CAAC;IAED,eAAe,CAAC,OAAuB;QAC/B,OAAO,KAAK,EAAE,EAAC,MAAM,EAAE,WAAW,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"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"}
|