@eeplatform/core 1.4.4 → 1.4.5
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/CHANGELOG.md +6 -0
- package/dist/index.d.ts +41 -18
- package/dist/index.js +897 -248
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +897 -248
- package/dist/index.mjs.map +1 -1
- package/package.json +5 -1
package/dist/index.mjs
CHANGED
|
@@ -10389,7 +10389,7 @@ var require_ms = __commonJS({
|
|
|
10389
10389
|
options = options || {};
|
|
10390
10390
|
var type = typeof val;
|
|
10391
10391
|
if (type === "string" && val.length > 0) {
|
|
10392
|
-
return
|
|
10392
|
+
return parse3(val);
|
|
10393
10393
|
} else if (type === "number" && isNaN(val) === false) {
|
|
10394
10394
|
return options.long ? fmtLong(val) : fmtShort(val);
|
|
10395
10395
|
}
|
|
@@ -10397,7 +10397,7 @@ var require_ms = __commonJS({
|
|
|
10397
10397
|
"val is not a non-empty string or a valid number. val=" + JSON.stringify(val)
|
|
10398
10398
|
);
|
|
10399
10399
|
};
|
|
10400
|
-
function
|
|
10400
|
+
function parse3(str) {
|
|
10401
10401
|
str = String(str);
|
|
10402
10402
|
if (str.length > 100) {
|
|
10403
10403
|
return;
|
|
@@ -10844,7 +10844,7 @@ var require_follow_redirects = __commonJS({
|
|
|
10844
10844
|
(function detectUnsupportedEnvironment() {
|
|
10845
10845
|
var looksLikeNode = typeof process !== "undefined";
|
|
10846
10846
|
var looksLikeBrowser = typeof window !== "undefined" && typeof document !== "undefined";
|
|
10847
|
-
var looksLikeV8 =
|
|
10847
|
+
var looksLikeV8 = isFunction3(Error.captureStackTrace);
|
|
10848
10848
|
if (!looksLikeNode && (looksLikeBrowser || !looksLikeV8)) {
|
|
10849
10849
|
console.warn("The follow-redirects package should be excluded from browser builds.");
|
|
10850
10850
|
}
|
|
@@ -10939,7 +10939,7 @@ var require_follow_redirects = __commonJS({
|
|
|
10939
10939
|
if (!isString2(data) && !isBuffer2(data)) {
|
|
10940
10940
|
throw new TypeError("data should be a string, Buffer or Uint8Array");
|
|
10941
10941
|
}
|
|
10942
|
-
if (
|
|
10942
|
+
if (isFunction3(encoding)) {
|
|
10943
10943
|
callback = encoding;
|
|
10944
10944
|
encoding = null;
|
|
10945
10945
|
}
|
|
@@ -10959,10 +10959,10 @@ var require_follow_redirects = __commonJS({
|
|
|
10959
10959
|
}
|
|
10960
10960
|
};
|
|
10961
10961
|
RedirectableRequest.prototype.end = function(data, encoding, callback) {
|
|
10962
|
-
if (
|
|
10962
|
+
if (isFunction3(data)) {
|
|
10963
10963
|
callback = data;
|
|
10964
10964
|
data = encoding = null;
|
|
10965
|
-
} else if (
|
|
10965
|
+
} else if (isFunction3(encoding)) {
|
|
10966
10966
|
callback = encoding;
|
|
10967
10967
|
encoding = null;
|
|
10968
10968
|
}
|
|
@@ -11163,7 +11163,7 @@ var require_follow_redirects = __commonJS({
|
|
|
11163
11163
|
if (redirectUrl.protocol !== currentUrlParts.protocol && redirectUrl.protocol !== "https:" || redirectUrl.host !== currentHost && !isSubdomain(redirectUrl.host, currentHost)) {
|
|
11164
11164
|
removeMatchingHeaders(/^(?:(?:proxy-)?authorization|cookie)$/i, this._options.headers);
|
|
11165
11165
|
}
|
|
11166
|
-
if (
|
|
11166
|
+
if (isFunction3(beforeRedirect)) {
|
|
11167
11167
|
var responseDetails = {
|
|
11168
11168
|
headers: response.headers,
|
|
11169
11169
|
statusCode
|
|
@@ -11198,7 +11198,7 @@ var require_follow_redirects = __commonJS({
|
|
|
11198
11198
|
options = validateUrl(input);
|
|
11199
11199
|
input = { protocol };
|
|
11200
11200
|
}
|
|
11201
|
-
if (
|
|
11201
|
+
if (isFunction3(options)) {
|
|
11202
11202
|
callback = options;
|
|
11203
11203
|
options = null;
|
|
11204
11204
|
}
|
|
@@ -11278,7 +11278,7 @@ var require_follow_redirects = __commonJS({
|
|
|
11278
11278
|
}
|
|
11279
11279
|
function createErrorType(code, message, baseClass) {
|
|
11280
11280
|
function CustomError(properties) {
|
|
11281
|
-
if (
|
|
11281
|
+
if (isFunction3(Error.captureStackTrace)) {
|
|
11282
11282
|
Error.captureStackTrace(this, this.constructor);
|
|
11283
11283
|
}
|
|
11284
11284
|
Object.assign(this, properties || {});
|
|
@@ -11313,7 +11313,7 @@ var require_follow_redirects = __commonJS({
|
|
|
11313
11313
|
function isString2(value) {
|
|
11314
11314
|
return typeof value === "string" || value instanceof String;
|
|
11315
11315
|
}
|
|
11316
|
-
function
|
|
11316
|
+
function isFunction3(value) {
|
|
11317
11317
|
return typeof value === "function";
|
|
11318
11318
|
}
|
|
11319
11319
|
function isBuffer2(value) {
|
|
@@ -13569,7 +13569,7 @@ var _global = (() => {
|
|
|
13569
13569
|
})();
|
|
13570
13570
|
var isContextDefined = (context) => !isUndefined(context) && context !== _global;
|
|
13571
13571
|
function merge() {
|
|
13572
|
-
const { caseless } = isContextDefined(this) && this || {};
|
|
13572
|
+
const { caseless, skipUndefined } = isContextDefined(this) && this || {};
|
|
13573
13573
|
const result = {};
|
|
13574
13574
|
const assignValue = (val, key) => {
|
|
13575
13575
|
const targetKey = caseless && findKey(result, key) || key;
|
|
@@ -13579,7 +13579,7 @@ function merge() {
|
|
|
13579
13579
|
result[targetKey] = merge({}, val);
|
|
13580
13580
|
} else if (isArray(val)) {
|
|
13581
13581
|
result[targetKey] = val.slice();
|
|
13582
|
-
} else {
|
|
13582
|
+
} else if (!skipUndefined || !isUndefined(val)) {
|
|
13583
13583
|
result[targetKey] = val;
|
|
13584
13584
|
}
|
|
13585
13585
|
};
|
|
@@ -13915,9 +13915,13 @@ AxiosError.from = (error, code, config2, request, response, customProps) => {
|
|
|
13915
13915
|
}, (prop) => {
|
|
13916
13916
|
return prop !== "isAxiosError";
|
|
13917
13917
|
});
|
|
13918
|
-
|
|
13919
|
-
|
|
13920
|
-
axiosError
|
|
13918
|
+
const msg = error && error.message ? error.message : "Error";
|
|
13919
|
+
const errCode = code == null && error ? error.code : code;
|
|
13920
|
+
AxiosError.call(axiosError, msg, errCode, config2, request, response);
|
|
13921
|
+
if (error && axiosError.cause == null) {
|
|
13922
|
+
Object.defineProperty(axiosError, "cause", { value: error, configurable: true });
|
|
13923
|
+
}
|
|
13924
|
+
axiosError.name = error && error.name || "Error";
|
|
13921
13925
|
customProps && Object.assign(axiosError, customProps);
|
|
13922
13926
|
return axiosError;
|
|
13923
13927
|
};
|
|
@@ -14080,7 +14084,7 @@ var AxiosURLSearchParams_default = AxiosURLSearchParams;
|
|
|
14080
14084
|
|
|
14081
14085
|
// node_modules/axios/lib/helpers/buildURL.js
|
|
14082
14086
|
function encode2(val) {
|
|
14083
|
-
return encodeURIComponent(val).replace(/%3A/gi, ":").replace(/%24/g, "$").replace(/%2C/gi, ",").replace(/%20/g, "+")
|
|
14087
|
+
return encodeURIComponent(val).replace(/%3A/gi, ":").replace(/%24/g, "$").replace(/%2C/gi, ",").replace(/%20/g, "+");
|
|
14084
14088
|
}
|
|
14085
14089
|
function buildURL(url2, params, options) {
|
|
14086
14090
|
if (!params) {
|
|
@@ -14378,7 +14382,7 @@ var defaults = {
|
|
|
14378
14382
|
const silentJSONParsing = transitional2 && transitional2.silentJSONParsing;
|
|
14379
14383
|
const strictJSONParsing = !silentJSONParsing && JSONRequested;
|
|
14380
14384
|
try {
|
|
14381
|
-
return JSON.parse(data);
|
|
14385
|
+
return JSON.parse(data, this.parseReviver);
|
|
14382
14386
|
} catch (e) {
|
|
14383
14387
|
if (strictJSONParsing) {
|
|
14384
14388
|
if (e.name === "SyntaxError") {
|
|
@@ -14765,7 +14769,7 @@ import util2 from "util";
|
|
|
14765
14769
|
import zlib from "zlib";
|
|
14766
14770
|
|
|
14767
14771
|
// node_modules/axios/lib/env/data.js
|
|
14768
|
-
var VERSION = "1.
|
|
14772
|
+
var VERSION = "1.12.2";
|
|
14769
14773
|
|
|
14770
14774
|
// node_modules/axios/lib/helpers/parseProtocol.js
|
|
14771
14775
|
function parseProtocol(url2) {
|
|
@@ -15164,6 +15168,60 @@ var progressEventDecorator = (total, throttled) => {
|
|
|
15164
15168
|
};
|
|
15165
15169
|
var asyncDecorator = (fn) => (...args) => utils_default.asap(() => fn(...args));
|
|
15166
15170
|
|
|
15171
|
+
// node_modules/axios/lib/helpers/estimateDataURLDecodedBytes.js
|
|
15172
|
+
function estimateDataURLDecodedBytes(url2) {
|
|
15173
|
+
if (!url2 || typeof url2 !== "string")
|
|
15174
|
+
return 0;
|
|
15175
|
+
if (!url2.startsWith("data:"))
|
|
15176
|
+
return 0;
|
|
15177
|
+
const comma = url2.indexOf(",");
|
|
15178
|
+
if (comma < 0)
|
|
15179
|
+
return 0;
|
|
15180
|
+
const meta = url2.slice(5, comma);
|
|
15181
|
+
const body = url2.slice(comma + 1);
|
|
15182
|
+
const isBase64 = /;base64/i.test(meta);
|
|
15183
|
+
if (isBase64) {
|
|
15184
|
+
let effectiveLen = body.length;
|
|
15185
|
+
const len = body.length;
|
|
15186
|
+
for (let i = 0; i < len; i++) {
|
|
15187
|
+
if (body.charCodeAt(i) === 37 && i + 2 < len) {
|
|
15188
|
+
const a = body.charCodeAt(i + 1);
|
|
15189
|
+
const b = body.charCodeAt(i + 2);
|
|
15190
|
+
const isHex = (a >= 48 && a <= 57 || a >= 65 && a <= 70 || a >= 97 && a <= 102) && (b >= 48 && b <= 57 || b >= 65 && b <= 70 || b >= 97 && b <= 102);
|
|
15191
|
+
if (isHex) {
|
|
15192
|
+
effectiveLen -= 2;
|
|
15193
|
+
i += 2;
|
|
15194
|
+
}
|
|
15195
|
+
}
|
|
15196
|
+
}
|
|
15197
|
+
let pad = 0;
|
|
15198
|
+
let idx = len - 1;
|
|
15199
|
+
const tailIsPct3D = (j) => j >= 2 && body.charCodeAt(j - 2) === 37 && // '%'
|
|
15200
|
+
body.charCodeAt(j - 1) === 51 && // '3'
|
|
15201
|
+
(body.charCodeAt(j) === 68 || body.charCodeAt(j) === 100);
|
|
15202
|
+
if (idx >= 0) {
|
|
15203
|
+
if (body.charCodeAt(idx) === 61) {
|
|
15204
|
+
pad++;
|
|
15205
|
+
idx--;
|
|
15206
|
+
} else if (tailIsPct3D(idx)) {
|
|
15207
|
+
pad++;
|
|
15208
|
+
idx -= 3;
|
|
15209
|
+
}
|
|
15210
|
+
}
|
|
15211
|
+
if (pad === 1 && idx >= 0) {
|
|
15212
|
+
if (body.charCodeAt(idx) === 61) {
|
|
15213
|
+
pad++;
|
|
15214
|
+
} else if (tailIsPct3D(idx)) {
|
|
15215
|
+
pad++;
|
|
15216
|
+
}
|
|
15217
|
+
}
|
|
15218
|
+
const groups = Math.floor(effectiveLen / 4);
|
|
15219
|
+
const bytes = groups * 3 - (pad || 0);
|
|
15220
|
+
return bytes > 0 ? bytes : 0;
|
|
15221
|
+
}
|
|
15222
|
+
return Buffer.byteLength(body, "utf8");
|
|
15223
|
+
}
|
|
15224
|
+
|
|
15167
15225
|
// node_modules/axios/lib/adapters/http.js
|
|
15168
15226
|
var zlibOptions = {
|
|
15169
15227
|
flush: zlib.constants.Z_SYNC_FLUSH,
|
|
@@ -15307,6 +15365,17 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config2) {
|
|
|
15307
15365
|
const parsed = new URL(fullPath, platform_default.hasBrowserEnv ? platform_default.origin : void 0);
|
|
15308
15366
|
const protocol = parsed.protocol || supportedProtocols[0];
|
|
15309
15367
|
if (protocol === "data:") {
|
|
15368
|
+
if (config2.maxContentLength > -1) {
|
|
15369
|
+
const dataUrl = String(config2.url || fullPath || "");
|
|
15370
|
+
const estimated = estimateDataURLDecodedBytes(dataUrl);
|
|
15371
|
+
if (estimated > config2.maxContentLength) {
|
|
15372
|
+
return reject(new AxiosError_default(
|
|
15373
|
+
"maxContentLength size of " + config2.maxContentLength + " exceeded",
|
|
15374
|
+
AxiosError_default.ERR_BAD_RESPONSE,
|
|
15375
|
+
config2
|
|
15376
|
+
));
|
|
15377
|
+
}
|
|
15378
|
+
}
|
|
15310
15379
|
let convertedData;
|
|
15311
15380
|
if (method !== "GET") {
|
|
15312
15381
|
return settle(resolve, reject, {
|
|
@@ -15802,13 +15871,17 @@ var resolveConfig_default = (config2) => {
|
|
|
15802
15871
|
"Basic " + btoa((auth.username || "") + ":" + (auth.password ? unescape(encodeURIComponent(auth.password)) : ""))
|
|
15803
15872
|
);
|
|
15804
15873
|
}
|
|
15805
|
-
let contentType;
|
|
15806
15874
|
if (utils_default.isFormData(data)) {
|
|
15807
15875
|
if (platform_default.hasStandardBrowserEnv || platform_default.hasStandardBrowserWebWorkerEnv) {
|
|
15808
15876
|
headers.setContentType(void 0);
|
|
15809
|
-
} else if ((
|
|
15810
|
-
const
|
|
15811
|
-
|
|
15877
|
+
} else if (utils_default.isFunction(data.getHeaders)) {
|
|
15878
|
+
const formHeaders = data.getHeaders();
|
|
15879
|
+
const allowedHeaders = ["content-type", "content-length"];
|
|
15880
|
+
Object.entries(formHeaders).forEach(([key, val]) => {
|
|
15881
|
+
if (allowedHeaders.includes(key.toLowerCase())) {
|
|
15882
|
+
headers.set(key, val);
|
|
15883
|
+
}
|
|
15884
|
+
});
|
|
15812
15885
|
}
|
|
15813
15886
|
}
|
|
15814
15887
|
if (platform_default.hasStandardBrowserEnv) {
|
|
@@ -15888,8 +15961,11 @@ var xhr_default = isXHRAdapterSupported && function(config2) {
|
|
|
15888
15961
|
reject(new AxiosError_default("Request aborted", AxiosError_default.ECONNABORTED, config2, request));
|
|
15889
15962
|
request = null;
|
|
15890
15963
|
};
|
|
15891
|
-
request.onerror = function handleError() {
|
|
15892
|
-
|
|
15964
|
+
request.onerror = function handleError(event) {
|
|
15965
|
+
const msg = event && event.message ? event.message : "Network Error";
|
|
15966
|
+
const err = new AxiosError_default(msg, AxiosError_default.ERR_NETWORK, config2, request);
|
|
15967
|
+
err.event = event || null;
|
|
15968
|
+
reject(err);
|
|
15893
15969
|
request = null;
|
|
15894
15970
|
};
|
|
15895
15971
|
request.ontimeout = function handleTimeout() {
|
|
@@ -16064,9 +16140,16 @@ var trackStream = (stream4, chunkSize, onProgress, onFinish) => {
|
|
|
16064
16140
|
};
|
|
16065
16141
|
|
|
16066
16142
|
// node_modules/axios/lib/adapters/fetch.js
|
|
16067
|
-
var
|
|
16068
|
-
var
|
|
16069
|
-
var
|
|
16143
|
+
var DEFAULT_CHUNK_SIZE = 64 * 1024;
|
|
16144
|
+
var { isFunction: isFunction2 } = utils_default;
|
|
16145
|
+
var globalFetchAPI = (({ Request, Response }) => ({
|
|
16146
|
+
Request,
|
|
16147
|
+
Response
|
|
16148
|
+
}))(utils_default.global);
|
|
16149
|
+
var {
|
|
16150
|
+
ReadableStream: ReadableStream2,
|
|
16151
|
+
TextEncoder: TextEncoder2
|
|
16152
|
+
} = utils_default.global;
|
|
16070
16153
|
var test = (fn, ...args) => {
|
|
16071
16154
|
try {
|
|
16072
16155
|
return !!fn(...args);
|
|
@@ -16074,164 +16157,204 @@ var test = (fn, ...args) => {
|
|
|
16074
16157
|
return false;
|
|
16075
16158
|
}
|
|
16076
16159
|
};
|
|
16077
|
-
var
|
|
16078
|
-
|
|
16079
|
-
|
|
16080
|
-
|
|
16081
|
-
|
|
16082
|
-
|
|
16083
|
-
|
|
16084
|
-
|
|
16085
|
-
|
|
16086
|
-
|
|
16087
|
-
return duplexAccessed && !hasContentType;
|
|
16088
|
-
});
|
|
16089
|
-
var DEFAULT_CHUNK_SIZE = 64 * 1024;
|
|
16090
|
-
var supportsResponseStream = isReadableStreamSupported && test(() => utils_default.isReadableStream(new Response("").body));
|
|
16091
|
-
var resolvers = {
|
|
16092
|
-
stream: supportsResponseStream && ((res) => res.body)
|
|
16093
|
-
};
|
|
16094
|
-
isFetchSupported && ((res) => {
|
|
16095
|
-
["text", "arrayBuffer", "blob", "formData", "stream"].forEach((type) => {
|
|
16096
|
-
!resolvers[type] && (resolvers[type] = utils_default.isFunction(res[type]) ? (res2) => res2[type]() : (_, config2) => {
|
|
16097
|
-
throw new AxiosError_default(`Response type '${type}' is not supported`, AxiosError_default.ERR_NOT_SUPPORT, config2);
|
|
16098
|
-
});
|
|
16099
|
-
});
|
|
16100
|
-
})(new Response());
|
|
16101
|
-
var getBodyLength = async (body) => {
|
|
16102
|
-
if (body == null) {
|
|
16103
|
-
return 0;
|
|
16104
|
-
}
|
|
16105
|
-
if (utils_default.isBlob(body)) {
|
|
16106
|
-
return body.size;
|
|
16160
|
+
var factory = (env) => {
|
|
16161
|
+
env = utils_default.merge.call({
|
|
16162
|
+
skipUndefined: true
|
|
16163
|
+
}, globalFetchAPI, env);
|
|
16164
|
+
const { fetch: envFetch, Request, Response } = env;
|
|
16165
|
+
const isFetchSupported = envFetch ? isFunction2(envFetch) : typeof fetch === "function";
|
|
16166
|
+
const isRequestSupported = isFunction2(Request);
|
|
16167
|
+
const isResponseSupported = isFunction2(Response);
|
|
16168
|
+
if (!isFetchSupported) {
|
|
16169
|
+
return false;
|
|
16107
16170
|
}
|
|
16108
|
-
|
|
16109
|
-
|
|
16171
|
+
const isReadableStreamSupported = isFetchSupported && isFunction2(ReadableStream2);
|
|
16172
|
+
const encodeText = isFetchSupported && (typeof TextEncoder2 === "function" ? ((encoder) => (str) => encoder.encode(str))(new TextEncoder2()) : async (str) => new Uint8Array(await new Request(str).arrayBuffer()));
|
|
16173
|
+
const supportsRequestStream = isRequestSupported && isReadableStreamSupported && test(() => {
|
|
16174
|
+
let duplexAccessed = false;
|
|
16175
|
+
const hasContentType = new Request(platform_default.origin, {
|
|
16176
|
+
body: new ReadableStream2(),
|
|
16110
16177
|
method: "POST",
|
|
16111
|
-
|
|
16112
|
-
|
|
16113
|
-
|
|
16114
|
-
|
|
16115
|
-
|
|
16116
|
-
return
|
|
16117
|
-
}
|
|
16118
|
-
if (utils_default.isURLSearchParams(body)) {
|
|
16119
|
-
body = body + "";
|
|
16120
|
-
}
|
|
16121
|
-
if (utils_default.isString(body)) {
|
|
16122
|
-
return (await encodeText(body)).byteLength;
|
|
16123
|
-
}
|
|
16124
|
-
};
|
|
16125
|
-
var resolveBodyLength = async (headers, body) => {
|
|
16126
|
-
const length = utils_default.toFiniteNumber(headers.getContentLength());
|
|
16127
|
-
return length == null ? getBodyLength(body) : length;
|
|
16128
|
-
};
|
|
16129
|
-
var fetch_default = isFetchSupported && (async (config2) => {
|
|
16130
|
-
let {
|
|
16131
|
-
url: url2,
|
|
16132
|
-
method,
|
|
16133
|
-
data,
|
|
16134
|
-
signal,
|
|
16135
|
-
cancelToken,
|
|
16136
|
-
timeout,
|
|
16137
|
-
onDownloadProgress,
|
|
16138
|
-
onUploadProgress,
|
|
16139
|
-
responseType,
|
|
16140
|
-
headers,
|
|
16141
|
-
withCredentials = "same-origin",
|
|
16142
|
-
fetchOptions
|
|
16143
|
-
} = resolveConfig_default(config2);
|
|
16144
|
-
responseType = responseType ? (responseType + "").toLowerCase() : "text";
|
|
16145
|
-
let composedSignal = composeSignals_default([signal, cancelToken && cancelToken.toAbortSignal()], timeout);
|
|
16146
|
-
let request;
|
|
16147
|
-
const unsubscribe = composedSignal && composedSignal.unsubscribe && (() => {
|
|
16148
|
-
composedSignal.unsubscribe();
|
|
16178
|
+
get duplex() {
|
|
16179
|
+
duplexAccessed = true;
|
|
16180
|
+
return "half";
|
|
16181
|
+
}
|
|
16182
|
+
}).headers.has("Content-Type");
|
|
16183
|
+
return duplexAccessed && !hasContentType;
|
|
16149
16184
|
});
|
|
16150
|
-
|
|
16151
|
-
|
|
16152
|
-
|
|
16153
|
-
|
|
16154
|
-
|
|
16155
|
-
|
|
16156
|
-
|
|
16185
|
+
const supportsResponseStream = isResponseSupported && isReadableStreamSupported && test(() => utils_default.isReadableStream(new Response("").body));
|
|
16186
|
+
const resolvers = {
|
|
16187
|
+
stream: supportsResponseStream && ((res) => res.body)
|
|
16188
|
+
};
|
|
16189
|
+
isFetchSupported && (() => {
|
|
16190
|
+
["text", "arrayBuffer", "blob", "formData", "stream"].forEach((type) => {
|
|
16191
|
+
!resolvers[type] && (resolvers[type] = (res, config2) => {
|
|
16192
|
+
let method = res && res[type];
|
|
16193
|
+
if (method) {
|
|
16194
|
+
return method.call(res);
|
|
16195
|
+
}
|
|
16196
|
+
throw new AxiosError_default(`Response type '${type}' is not supported`, AxiosError_default.ERR_NOT_SUPPORT, config2);
|
|
16157
16197
|
});
|
|
16158
|
-
|
|
16159
|
-
|
|
16160
|
-
|
|
16161
|
-
|
|
16162
|
-
|
|
16163
|
-
const [onProgress, flush] = progressEventDecorator(
|
|
16164
|
-
requestContentLength,
|
|
16165
|
-
progressEventReducer(asyncDecorator(onUploadProgress))
|
|
16166
|
-
);
|
|
16167
|
-
data = trackStream(_request.body, DEFAULT_CHUNK_SIZE, onProgress, flush);
|
|
16168
|
-
}
|
|
16198
|
+
});
|
|
16199
|
+
})();
|
|
16200
|
+
const getBodyLength = async (body) => {
|
|
16201
|
+
if (body == null) {
|
|
16202
|
+
return 0;
|
|
16169
16203
|
}
|
|
16170
|
-
if (
|
|
16171
|
-
|
|
16204
|
+
if (utils_default.isBlob(body)) {
|
|
16205
|
+
return body.size;
|
|
16172
16206
|
}
|
|
16173
|
-
|
|
16174
|
-
|
|
16175
|
-
|
|
16176
|
-
|
|
16177
|
-
method: method.toUpperCase(),
|
|
16178
|
-
headers: headers.normalize().toJSON(),
|
|
16179
|
-
body: data,
|
|
16180
|
-
duplex: "half",
|
|
16181
|
-
credentials: isCredentialsSupported ? withCredentials : void 0
|
|
16182
|
-
});
|
|
16183
|
-
let response = await fetch(request, fetchOptions);
|
|
16184
|
-
const isStreamResponse = supportsResponseStream && (responseType === "stream" || responseType === "response");
|
|
16185
|
-
if (supportsResponseStream && (onDownloadProgress || isStreamResponse && unsubscribe)) {
|
|
16186
|
-
const options = {};
|
|
16187
|
-
["status", "statusText", "headers"].forEach((prop) => {
|
|
16188
|
-
options[prop] = response[prop];
|
|
16207
|
+
if (utils_default.isSpecCompliantForm(body)) {
|
|
16208
|
+
const _request = new Request(platform_default.origin, {
|
|
16209
|
+
method: "POST",
|
|
16210
|
+
body
|
|
16189
16211
|
});
|
|
16190
|
-
|
|
16191
|
-
const [onProgress, flush] = onDownloadProgress && progressEventDecorator(
|
|
16192
|
-
responseContentLength,
|
|
16193
|
-
progressEventReducer(asyncDecorator(onDownloadProgress), true)
|
|
16194
|
-
) || [];
|
|
16195
|
-
response = new Response(
|
|
16196
|
-
trackStream(response.body, DEFAULT_CHUNK_SIZE, onProgress, () => {
|
|
16197
|
-
flush && flush();
|
|
16198
|
-
unsubscribe && unsubscribe();
|
|
16199
|
-
}),
|
|
16200
|
-
options
|
|
16201
|
-
);
|
|
16212
|
+
return (await _request.arrayBuffer()).byteLength;
|
|
16202
16213
|
}
|
|
16203
|
-
|
|
16204
|
-
|
|
16205
|
-
|
|
16206
|
-
|
|
16207
|
-
|
|
16208
|
-
|
|
16209
|
-
|
|
16210
|
-
|
|
16211
|
-
|
|
16212
|
-
|
|
16213
|
-
|
|
16214
|
-
|
|
16214
|
+
if (utils_default.isArrayBufferView(body) || utils_default.isArrayBuffer(body)) {
|
|
16215
|
+
return body.byteLength;
|
|
16216
|
+
}
|
|
16217
|
+
if (utils_default.isURLSearchParams(body)) {
|
|
16218
|
+
body = body + "";
|
|
16219
|
+
}
|
|
16220
|
+
if (utils_default.isString(body)) {
|
|
16221
|
+
return (await encodeText(body)).byteLength;
|
|
16222
|
+
}
|
|
16223
|
+
};
|
|
16224
|
+
const resolveBodyLength = async (headers, body) => {
|
|
16225
|
+
const length = utils_default.toFiniteNumber(headers.getContentLength());
|
|
16226
|
+
return length == null ? getBodyLength(body) : length;
|
|
16227
|
+
};
|
|
16228
|
+
return async (config2) => {
|
|
16229
|
+
let {
|
|
16230
|
+
url: url2,
|
|
16231
|
+
method,
|
|
16232
|
+
data,
|
|
16233
|
+
signal,
|
|
16234
|
+
cancelToken,
|
|
16235
|
+
timeout,
|
|
16236
|
+
onDownloadProgress,
|
|
16237
|
+
onUploadProgress,
|
|
16238
|
+
responseType,
|
|
16239
|
+
headers,
|
|
16240
|
+
withCredentials = "same-origin",
|
|
16241
|
+
fetchOptions
|
|
16242
|
+
} = resolveConfig_default(config2);
|
|
16243
|
+
let _fetch = envFetch || fetch;
|
|
16244
|
+
responseType = responseType ? (responseType + "").toLowerCase() : "text";
|
|
16245
|
+
let composedSignal = composeSignals_default([signal, cancelToken && cancelToken.toAbortSignal()], timeout);
|
|
16246
|
+
let request = null;
|
|
16247
|
+
const unsubscribe = composedSignal && composedSignal.unsubscribe && (() => {
|
|
16248
|
+
composedSignal.unsubscribe();
|
|
16215
16249
|
});
|
|
16216
|
-
|
|
16217
|
-
|
|
16218
|
-
|
|
16219
|
-
|
|
16220
|
-
|
|
16221
|
-
|
|
16222
|
-
|
|
16250
|
+
let requestContentLength;
|
|
16251
|
+
try {
|
|
16252
|
+
if (onUploadProgress && supportsRequestStream && method !== "get" && method !== "head" && (requestContentLength = await resolveBodyLength(headers, data)) !== 0) {
|
|
16253
|
+
let _request = new Request(url2, {
|
|
16254
|
+
method: "POST",
|
|
16255
|
+
body: data,
|
|
16256
|
+
duplex: "half"
|
|
16257
|
+
});
|
|
16258
|
+
let contentTypeHeader;
|
|
16259
|
+
if (utils_default.isFormData(data) && (contentTypeHeader = _request.headers.get("content-type"))) {
|
|
16260
|
+
headers.setContentType(contentTypeHeader);
|
|
16223
16261
|
}
|
|
16224
|
-
|
|
16262
|
+
if (_request.body) {
|
|
16263
|
+
const [onProgress, flush] = progressEventDecorator(
|
|
16264
|
+
requestContentLength,
|
|
16265
|
+
progressEventReducer(asyncDecorator(onUploadProgress))
|
|
16266
|
+
);
|
|
16267
|
+
data = trackStream(_request.body, DEFAULT_CHUNK_SIZE, onProgress, flush);
|
|
16268
|
+
}
|
|
16269
|
+
}
|
|
16270
|
+
if (!utils_default.isString(withCredentials)) {
|
|
16271
|
+
withCredentials = withCredentials ? "include" : "omit";
|
|
16272
|
+
}
|
|
16273
|
+
const isCredentialsSupported = isRequestSupported && "credentials" in Request.prototype;
|
|
16274
|
+
const resolvedOptions = {
|
|
16275
|
+
...fetchOptions,
|
|
16276
|
+
signal: composedSignal,
|
|
16277
|
+
method: method.toUpperCase(),
|
|
16278
|
+
headers: headers.normalize().toJSON(),
|
|
16279
|
+
body: data,
|
|
16280
|
+
duplex: "half",
|
|
16281
|
+
credentials: isCredentialsSupported ? withCredentials : void 0
|
|
16282
|
+
};
|
|
16283
|
+
request = isRequestSupported && new Request(url2, resolvedOptions);
|
|
16284
|
+
let response = await (isRequestSupported ? _fetch(request, fetchOptions) : _fetch(url2, resolvedOptions));
|
|
16285
|
+
const isStreamResponse = supportsResponseStream && (responseType === "stream" || responseType === "response");
|
|
16286
|
+
if (supportsResponseStream && (onDownloadProgress || isStreamResponse && unsubscribe)) {
|
|
16287
|
+
const options = {};
|
|
16288
|
+
["status", "statusText", "headers"].forEach((prop) => {
|
|
16289
|
+
options[prop] = response[prop];
|
|
16290
|
+
});
|
|
16291
|
+
const responseContentLength = utils_default.toFiniteNumber(response.headers.get("content-length"));
|
|
16292
|
+
const [onProgress, flush] = onDownloadProgress && progressEventDecorator(
|
|
16293
|
+
responseContentLength,
|
|
16294
|
+
progressEventReducer(asyncDecorator(onDownloadProgress), true)
|
|
16295
|
+
) || [];
|
|
16296
|
+
response = new Response(
|
|
16297
|
+
trackStream(response.body, DEFAULT_CHUNK_SIZE, onProgress, () => {
|
|
16298
|
+
flush && flush();
|
|
16299
|
+
unsubscribe && unsubscribe();
|
|
16300
|
+
}),
|
|
16301
|
+
options
|
|
16302
|
+
);
|
|
16303
|
+
}
|
|
16304
|
+
responseType = responseType || "text";
|
|
16305
|
+
let responseData = await resolvers[utils_default.findKey(resolvers, responseType) || "text"](response, config2);
|
|
16306
|
+
!isStreamResponse && unsubscribe && unsubscribe();
|
|
16307
|
+
return await new Promise((resolve, reject) => {
|
|
16308
|
+
settle(resolve, reject, {
|
|
16309
|
+
data: responseData,
|
|
16310
|
+
headers: AxiosHeaders_default.from(response.headers),
|
|
16311
|
+
status: response.status,
|
|
16312
|
+
statusText: response.statusText,
|
|
16313
|
+
config: config2,
|
|
16314
|
+
request
|
|
16315
|
+
});
|
|
16316
|
+
});
|
|
16317
|
+
} catch (err) {
|
|
16318
|
+
unsubscribe && unsubscribe();
|
|
16319
|
+
if (err && err.name === "TypeError" && /Load failed|fetch/i.test(err.message)) {
|
|
16320
|
+
throw Object.assign(
|
|
16321
|
+
new AxiosError_default("Network Error", AxiosError_default.ERR_NETWORK, config2, request),
|
|
16322
|
+
{
|
|
16323
|
+
cause: err.cause || err
|
|
16324
|
+
}
|
|
16325
|
+
);
|
|
16326
|
+
}
|
|
16327
|
+
throw AxiosError_default.from(err, err && err.code, config2, request);
|
|
16225
16328
|
}
|
|
16226
|
-
|
|
16227
|
-
|
|
16228
|
-
|
|
16329
|
+
};
|
|
16330
|
+
};
|
|
16331
|
+
var seedCache = /* @__PURE__ */ new Map();
|
|
16332
|
+
var getFetch = (config2) => {
|
|
16333
|
+
let env = config2 ? config2.env : {};
|
|
16334
|
+
const { fetch: fetch2, Request, Response } = env;
|
|
16335
|
+
const seeds = [
|
|
16336
|
+
Request,
|
|
16337
|
+
Response,
|
|
16338
|
+
fetch2
|
|
16339
|
+
];
|
|
16340
|
+
let len = seeds.length, i = len, seed, target, map = seedCache;
|
|
16341
|
+
while (i--) {
|
|
16342
|
+
seed = seeds[i];
|
|
16343
|
+
target = map.get(seed);
|
|
16344
|
+
target === void 0 && map.set(seed, target = i ? /* @__PURE__ */ new Map() : factory(env));
|
|
16345
|
+
map = target;
|
|
16346
|
+
}
|
|
16347
|
+
return target;
|
|
16348
|
+
};
|
|
16349
|
+
var adapter = getFetch();
|
|
16229
16350
|
|
|
16230
16351
|
// node_modules/axios/lib/adapters/adapters.js
|
|
16231
16352
|
var knownAdapters = {
|
|
16232
16353
|
http: http_default,
|
|
16233
16354
|
xhr: xhr_default,
|
|
16234
|
-
fetch:
|
|
16355
|
+
fetch: {
|
|
16356
|
+
get: getFetch
|
|
16357
|
+
}
|
|
16235
16358
|
};
|
|
16236
16359
|
utils_default.forEach(knownAdapters, (fn, value) => {
|
|
16237
16360
|
if (fn) {
|
|
@@ -16243,30 +16366,30 @@ utils_default.forEach(knownAdapters, (fn, value) => {
|
|
|
16243
16366
|
}
|
|
16244
16367
|
});
|
|
16245
16368
|
var renderReason = (reason) => `- ${reason}`;
|
|
16246
|
-
var isResolvedHandle = (
|
|
16369
|
+
var isResolvedHandle = (adapter2) => utils_default.isFunction(adapter2) || adapter2 === null || adapter2 === false;
|
|
16247
16370
|
var adapters_default = {
|
|
16248
|
-
getAdapter: (adapters) => {
|
|
16371
|
+
getAdapter: (adapters, config2) => {
|
|
16249
16372
|
adapters = utils_default.isArray(adapters) ? adapters : [adapters];
|
|
16250
16373
|
const { length } = adapters;
|
|
16251
16374
|
let nameOrAdapter;
|
|
16252
|
-
let
|
|
16375
|
+
let adapter2;
|
|
16253
16376
|
const rejectedReasons = {};
|
|
16254
16377
|
for (let i = 0; i < length; i++) {
|
|
16255
16378
|
nameOrAdapter = adapters[i];
|
|
16256
16379
|
let id;
|
|
16257
|
-
|
|
16380
|
+
adapter2 = nameOrAdapter;
|
|
16258
16381
|
if (!isResolvedHandle(nameOrAdapter)) {
|
|
16259
|
-
|
|
16260
|
-
if (
|
|
16382
|
+
adapter2 = knownAdapters[(id = String(nameOrAdapter)).toLowerCase()];
|
|
16383
|
+
if (adapter2 === void 0) {
|
|
16261
16384
|
throw new AxiosError_default(`Unknown adapter '${id}'`);
|
|
16262
16385
|
}
|
|
16263
16386
|
}
|
|
16264
|
-
if (
|
|
16387
|
+
if (adapter2 && (utils_default.isFunction(adapter2) || (adapter2 = adapter2.get(config2)))) {
|
|
16265
16388
|
break;
|
|
16266
16389
|
}
|
|
16267
|
-
rejectedReasons[id || "#" + i] =
|
|
16390
|
+
rejectedReasons[id || "#" + i] = adapter2;
|
|
16268
16391
|
}
|
|
16269
|
-
if (!
|
|
16392
|
+
if (!adapter2) {
|
|
16270
16393
|
const reasons = Object.entries(rejectedReasons).map(
|
|
16271
16394
|
([id, state]) => `adapter ${id} ` + (state === false ? "is not supported by the environment" : "is not available in the build")
|
|
16272
16395
|
);
|
|
@@ -16276,7 +16399,7 @@ var adapters_default = {
|
|
|
16276
16399
|
"ERR_NOT_SUPPORT"
|
|
16277
16400
|
);
|
|
16278
16401
|
}
|
|
16279
|
-
return
|
|
16402
|
+
return adapter2;
|
|
16280
16403
|
},
|
|
16281
16404
|
adapters: knownAdapters
|
|
16282
16405
|
};
|
|
@@ -16300,8 +16423,8 @@ function dispatchRequest(config2) {
|
|
|
16300
16423
|
if (["post", "put", "patch"].indexOf(config2.method) !== -1) {
|
|
16301
16424
|
config2.headers.setContentType("application/x-www-form-urlencoded", false);
|
|
16302
16425
|
}
|
|
16303
|
-
const
|
|
16304
|
-
return
|
|
16426
|
+
const adapter2 = adapters_default.getAdapter(config2.adapter || defaults_default.adapter, config2);
|
|
16427
|
+
return adapter2(config2).then(function onAdapterResolution(response) {
|
|
16305
16428
|
throwIfCancellationRequested(config2);
|
|
16306
16429
|
response.data = transformData.call(
|
|
16307
16430
|
config2,
|
|
@@ -16507,7 +16630,6 @@ var Axios = class {
|
|
|
16507
16630
|
}
|
|
16508
16631
|
len = requestInterceptorChain.length;
|
|
16509
16632
|
let newConfig = config2;
|
|
16510
|
-
i = 0;
|
|
16511
16633
|
while (i < len) {
|
|
16512
16634
|
const onFulfilled = requestInterceptorChain[i++];
|
|
16513
16635
|
const onRejected = requestInterceptorChain[i++];
|
|
@@ -26365,11 +26487,8 @@ function useDivisionController() {
|
|
|
26365
26487
|
return;
|
|
26366
26488
|
}
|
|
26367
26489
|
try {
|
|
26368
|
-
const
|
|
26369
|
-
res.json(
|
|
26370
|
-
message: "Successfully retrieved division.",
|
|
26371
|
-
data: { division }
|
|
26372
|
-
});
|
|
26490
|
+
const data = await _getById(id);
|
|
26491
|
+
res.json(data);
|
|
26373
26492
|
return;
|
|
26374
26493
|
} catch (error2) {
|
|
26375
26494
|
next(error2);
|
|
@@ -26456,16 +26575,17 @@ import Joi31 from "joi";
|
|
|
26456
26575
|
import { ObjectId as ObjectId37 } from "mongodb";
|
|
26457
26576
|
var schemaSchool = Joi31.object({
|
|
26458
26577
|
_id: Joi31.string().hex().optional().allow("", null),
|
|
26459
|
-
id: Joi31.string().
|
|
26460
|
-
name: Joi31.string().
|
|
26461
|
-
country: Joi31.string().
|
|
26462
|
-
address: Joi31.string().
|
|
26578
|
+
id: Joi31.string().optional().allow("", null),
|
|
26579
|
+
name: Joi31.string().optional().allow("", null),
|
|
26580
|
+
country: Joi31.string().optional().allow("", null),
|
|
26581
|
+
address: Joi31.string().optional().allow("", null),
|
|
26463
26582
|
continuedAddress: Joi31.string().optional().allow("", null),
|
|
26464
|
-
city: Joi31.string().required(),
|
|
26465
|
-
province: Joi31.string().required(),
|
|
26466
|
-
|
|
26467
|
-
|
|
26468
|
-
|
|
26583
|
+
city: Joi31.string().required().allow("", null),
|
|
26584
|
+
province: Joi31.string().required().allow("", null),
|
|
26585
|
+
district: Joi31.string().optional().allow("", null),
|
|
26586
|
+
postalCode: Joi31.string().required().allow("", null),
|
|
26587
|
+
courses: Joi31.array().items(Joi31.string()).optional(),
|
|
26588
|
+
principalName: Joi31.string().required().allow("", null),
|
|
26469
26589
|
principalEmail: Joi31.string().email().optional().allow("", null),
|
|
26470
26590
|
principalNumber: Joi31.string().optional().allow("", null),
|
|
26471
26591
|
region: Joi31.string().hex().required(),
|
|
@@ -26475,7 +26595,7 @@ var schemaSchool = Joi31.object({
|
|
|
26475
26595
|
status: Joi31.string().optional().allow(null, ""),
|
|
26476
26596
|
createdAt: Joi31.date().optional().allow("", null),
|
|
26477
26597
|
updatedAt: Joi31.date().optional().allow("", null),
|
|
26478
|
-
createdBy: Joi31.string().hex().
|
|
26598
|
+
createdBy: Joi31.string().hex().optional().allow("", null)
|
|
26479
26599
|
});
|
|
26480
26600
|
function MSchool(value) {
|
|
26481
26601
|
const { error } = schemaSchool.validate(value);
|
|
@@ -26514,15 +26634,15 @@ function MSchool(value) {
|
|
|
26514
26634
|
_id: value._id ? value._id : new ObjectId37(),
|
|
26515
26635
|
id: value.id,
|
|
26516
26636
|
name: value.name,
|
|
26517
|
-
country: value.country,
|
|
26518
|
-
address: value.address,
|
|
26637
|
+
country: value.country ?? "",
|
|
26638
|
+
address: value.address ?? "",
|
|
26519
26639
|
continuedAddress: value.continuedAddress ?? "",
|
|
26520
|
-
city: value.city,
|
|
26521
|
-
province: value.province,
|
|
26522
|
-
postalCode: value.postalCode,
|
|
26640
|
+
city: value.city ?? "",
|
|
26641
|
+
province: value.province ?? "",
|
|
26642
|
+
postalCode: value.postalCode ?? "",
|
|
26523
26643
|
courses: value.courses || [],
|
|
26524
|
-
principalName: value.principalName,
|
|
26525
|
-
principalEmail: value.principalEmail,
|
|
26644
|
+
principalName: value.principalName ?? "",
|
|
26645
|
+
principalEmail: value.principalEmail ?? "",
|
|
26526
26646
|
principalNumber: value.principalNumber ?? "",
|
|
26527
26647
|
region: value.region,
|
|
26528
26648
|
regionName: value.regionName ?? "",
|
|
@@ -26531,7 +26651,7 @@ function MSchool(value) {
|
|
|
26531
26651
|
createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
|
|
26532
26652
|
updatedAt: value.updatedAt ?? "",
|
|
26533
26653
|
status: value.status ?? "pending",
|
|
26534
|
-
createdBy: value.createdBy
|
|
26654
|
+
createdBy: value.createdBy ?? ""
|
|
26535
26655
|
};
|
|
26536
26656
|
}
|
|
26537
26657
|
|
|
@@ -26806,8 +26926,16 @@ function useSchoolRepo() {
|
|
|
26806
26926
|
|
|
26807
26927
|
// src/services/school.service.ts
|
|
26808
26928
|
import { BadRequestError as BadRequestError57, useAtlas as useAtlas30, logger as logger28 } from "@eeplatform/nodejs-utils";
|
|
26929
|
+
import * as XLSX from "xlsx";
|
|
26930
|
+
import * as Papa from "papaparse";
|
|
26931
|
+
import * as BSON from "bson";
|
|
26809
26932
|
function useSchoolService() {
|
|
26810
|
-
const {
|
|
26933
|
+
const {
|
|
26934
|
+
add: addSchool,
|
|
26935
|
+
getPendingByCreatedBy,
|
|
26936
|
+
updateStatusById,
|
|
26937
|
+
getPendingById
|
|
26938
|
+
} = useSchoolRepo();
|
|
26811
26939
|
const { addRole } = useRoleRepo();
|
|
26812
26940
|
const { getUserById } = useUserRepo();
|
|
26813
26941
|
const { add: addMember } = useMemberRepo();
|
|
@@ -26824,7 +26952,7 @@ function useSchoolService() {
|
|
|
26824
26952
|
}
|
|
26825
26953
|
try {
|
|
26826
26954
|
value.status = "pending";
|
|
26827
|
-
await
|
|
26955
|
+
await addSchool(value);
|
|
26828
26956
|
return "Request to register school has been sent successfully. Please wait for approval.";
|
|
26829
26957
|
} catch (error2) {
|
|
26830
26958
|
throw error2;
|
|
@@ -26843,7 +26971,7 @@ function useSchoolService() {
|
|
|
26843
26971
|
session.startTransaction();
|
|
26844
26972
|
school.status = "approved";
|
|
26845
26973
|
await updateStatusById(id, "active", session);
|
|
26846
|
-
const roleType = "school";
|
|
26974
|
+
const roleType = "basic-edu-school";
|
|
26847
26975
|
const roleName = "Admin";
|
|
26848
26976
|
const roleId = await addRole(
|
|
26849
26977
|
{
|
|
@@ -26888,9 +27016,245 @@ function useSchoolService() {
|
|
|
26888
27016
|
await session.endSession();
|
|
26889
27017
|
}
|
|
26890
27018
|
}
|
|
27019
|
+
async function add(value) {
|
|
27020
|
+
const { error } = schemaSchool.validate(value);
|
|
27021
|
+
if (error) {
|
|
27022
|
+
throw new BadRequestError57(error.message);
|
|
27023
|
+
}
|
|
27024
|
+
const session = useAtlas30.getClient()?.startSession();
|
|
27025
|
+
if (!session) {
|
|
27026
|
+
throw new Error("Unable to start session for school service.");
|
|
27027
|
+
}
|
|
27028
|
+
try {
|
|
27029
|
+
session.startTransaction();
|
|
27030
|
+
value.status = "active";
|
|
27031
|
+
const schoolId = await addSchool(value, session);
|
|
27032
|
+
const roleType = "basic-edu-school";
|
|
27033
|
+
const roleName = "Admin";
|
|
27034
|
+
const roleId = await addRole(
|
|
27035
|
+
{
|
|
27036
|
+
id: schoolId.toString(),
|
|
27037
|
+
type: roleType,
|
|
27038
|
+
name: roleName,
|
|
27039
|
+
permissions: ["*"],
|
|
27040
|
+
status: "active",
|
|
27041
|
+
default: true
|
|
27042
|
+
},
|
|
27043
|
+
session
|
|
27044
|
+
);
|
|
27045
|
+
if (!value.createdBy) {
|
|
27046
|
+
throw new BadRequestError57("School must have a creator.");
|
|
27047
|
+
}
|
|
27048
|
+
const user = await getUserById(value.createdBy ?? "");
|
|
27049
|
+
if (!user) {
|
|
27050
|
+
throw new BadRequestError57("User not found for the school creator.");
|
|
27051
|
+
}
|
|
27052
|
+
await addMember(
|
|
27053
|
+
{
|
|
27054
|
+
org: schoolId.toString(),
|
|
27055
|
+
orgName: value.name,
|
|
27056
|
+
user: value.createdBy.toString(),
|
|
27057
|
+
name: `${user.firstName} ${user.lastName}`,
|
|
27058
|
+
role: roleId.toString(),
|
|
27059
|
+
roleName,
|
|
27060
|
+
type: roleType
|
|
27061
|
+
},
|
|
27062
|
+
session
|
|
27063
|
+
);
|
|
27064
|
+
await session.commitTransaction();
|
|
27065
|
+
return "School has been added and activated successfully.";
|
|
27066
|
+
} catch (error2) {
|
|
27067
|
+
logger28.log({
|
|
27068
|
+
level: "error",
|
|
27069
|
+
message: `Error adding school: ${error2.message}`
|
|
27070
|
+
});
|
|
27071
|
+
await session.abortTransaction();
|
|
27072
|
+
throw error2;
|
|
27073
|
+
} finally {
|
|
27074
|
+
await session.endSession();
|
|
27075
|
+
}
|
|
27076
|
+
}
|
|
27077
|
+
async function addBulk(file, region, division) {
|
|
27078
|
+
const MAX_SIZE = 16 * 1024 * 1024;
|
|
27079
|
+
if (file.size > MAX_SIZE) {
|
|
27080
|
+
throw new BadRequestError57(
|
|
27081
|
+
"File size exceeds 16MB limit. Please use a smaller file to ensure transaction compatibility."
|
|
27082
|
+
);
|
|
27083
|
+
}
|
|
27084
|
+
let schools = [];
|
|
27085
|
+
const validatedSchools = [];
|
|
27086
|
+
const totalSize = validatedSchools.reduce(
|
|
27087
|
+
(sum, school) => sum + BSON.calculateObjectSize(school),
|
|
27088
|
+
0
|
|
27089
|
+
);
|
|
27090
|
+
try {
|
|
27091
|
+
if (file.mimetype.includes("sheet") || file.originalname.endsWith(".xlsx") || file.originalname.endsWith(".xls")) {
|
|
27092
|
+
const workbook = XLSX.read(file.buffer);
|
|
27093
|
+
const sheetName = workbook.SheetNames[0];
|
|
27094
|
+
const worksheet = workbook.Sheets[sheetName];
|
|
27095
|
+
schools = XLSX.utils.sheet_to_json(worksheet);
|
|
27096
|
+
} else if (file.mimetype.includes("csv") || file.originalname.endsWith(".csv")) {
|
|
27097
|
+
const csvText = file.buffer.toString("utf8");
|
|
27098
|
+
const parseResult = Papa.parse(csvText, {
|
|
27099
|
+
header: true,
|
|
27100
|
+
skipEmptyLines: true,
|
|
27101
|
+
transformHeader: (header) => header.trim()
|
|
27102
|
+
});
|
|
27103
|
+
if (parseResult.errors.length > 0) {
|
|
27104
|
+
throw new BadRequestError57(
|
|
27105
|
+
`CSV parsing error: ${parseResult.errors[0].message}`
|
|
27106
|
+
);
|
|
27107
|
+
}
|
|
27108
|
+
schools = parseResult.data;
|
|
27109
|
+
} else {
|
|
27110
|
+
throw new BadRequestError57(
|
|
27111
|
+
"Unsupported file type. Please upload an Excel (.xlsx, .xls) or CSV (.csv) file."
|
|
27112
|
+
);
|
|
27113
|
+
}
|
|
27114
|
+
if (!schools || schools.length === 0) {
|
|
27115
|
+
throw new BadRequestError57("No data found in the uploaded file.");
|
|
27116
|
+
}
|
|
27117
|
+
const errors = [];
|
|
27118
|
+
for (let i = 0; i < schools.length; i++) {
|
|
27119
|
+
const schoolData = schools[i];
|
|
27120
|
+
const rowNumber = i + 1;
|
|
27121
|
+
try {
|
|
27122
|
+
const schoolName = schoolData.schoolName || schoolData.name || "";
|
|
27123
|
+
const schoolId = schoolData.schoolId || schoolData.id || "";
|
|
27124
|
+
const district = schoolData.district || "";
|
|
27125
|
+
if (!schoolName.trim()) {
|
|
27126
|
+
errors.push(`Row ${rowNumber}: School name is required`);
|
|
27127
|
+
continue;
|
|
27128
|
+
}
|
|
27129
|
+
if (!schoolId.trim()) {
|
|
27130
|
+
errors.push(`Row ${rowNumber}: School ID is required`);
|
|
27131
|
+
continue;
|
|
27132
|
+
}
|
|
27133
|
+
if (!district.trim()) {
|
|
27134
|
+
errors.push(`Row ${rowNumber}: District is required`);
|
|
27135
|
+
continue;
|
|
27136
|
+
}
|
|
27137
|
+
const school = {
|
|
27138
|
+
id: schoolId.trim(),
|
|
27139
|
+
name: schoolName.trim(),
|
|
27140
|
+
country: "Philippines",
|
|
27141
|
+
// Default country
|
|
27142
|
+
address: district.trim(),
|
|
27143
|
+
// Use district as address
|
|
27144
|
+
continuedAddress: "",
|
|
27145
|
+
city: district.trim(),
|
|
27146
|
+
// Use district as city
|
|
27147
|
+
province: "",
|
|
27148
|
+
// Will need to be set based on region/division
|
|
27149
|
+
postalCode: "",
|
|
27150
|
+
courses: [],
|
|
27151
|
+
// Empty array for courses
|
|
27152
|
+
principalName: "",
|
|
27153
|
+
principalEmail: "",
|
|
27154
|
+
principalNumber: "",
|
|
27155
|
+
region,
|
|
27156
|
+
regionName: "",
|
|
27157
|
+
// Will be populated from region lookup
|
|
27158
|
+
division,
|
|
27159
|
+
divisionName: "",
|
|
27160
|
+
// Will be populated from division lookup
|
|
27161
|
+
status: "active"
|
|
27162
|
+
};
|
|
27163
|
+
const { error } = schemaSchool.validate(school);
|
|
27164
|
+
if (error) {
|
|
27165
|
+
errors.push(`Row ${rowNumber}: ${error.message}`);
|
|
27166
|
+
continue;
|
|
27167
|
+
}
|
|
27168
|
+
validatedSchools.push(school);
|
|
27169
|
+
} catch (error) {
|
|
27170
|
+
errors.push(
|
|
27171
|
+
`Row ${rowNumber}: ${error.message || "Invalid data format"}`
|
|
27172
|
+
);
|
|
27173
|
+
}
|
|
27174
|
+
}
|
|
27175
|
+
if (errors.length > 0) {
|
|
27176
|
+
throw new BadRequestError57(
|
|
27177
|
+
`Validation errors found:
|
|
27178
|
+
${errors.slice(0, 10).join("\n")}${errors.length > 10 ? `
|
|
27179
|
+
... and ${errors.length - 10} more errors` : ""}`
|
|
27180
|
+
);
|
|
27181
|
+
}
|
|
27182
|
+
if (validatedSchools.length === 0) {
|
|
27183
|
+
throw new BadRequestError57(
|
|
27184
|
+
"No valid school records found after validation."
|
|
27185
|
+
);
|
|
27186
|
+
}
|
|
27187
|
+
if (totalSize > MAX_SIZE) {
|
|
27188
|
+
throw new BadRequestError57(
|
|
27189
|
+
`Data payload (${Math.round(
|
|
27190
|
+
totalSize / 1024 / 1024
|
|
27191
|
+
)}MB) exceeds MongoDB transaction limit of 16MB. Please reduce the number of records or split into smaller files.`
|
|
27192
|
+
);
|
|
27193
|
+
}
|
|
27194
|
+
} catch (error) {
|
|
27195
|
+
if (error instanceof BadRequestError57) {
|
|
27196
|
+
throw error;
|
|
27197
|
+
}
|
|
27198
|
+
throw new BadRequestError57(`File processing error: ${error.message}`);
|
|
27199
|
+
}
|
|
27200
|
+
const session = useAtlas30.getClient()?.startSession();
|
|
27201
|
+
if (!session) {
|
|
27202
|
+
throw new Error("Unable to start session for bulk school upload.");
|
|
27203
|
+
}
|
|
27204
|
+
try {
|
|
27205
|
+
session.startTransaction();
|
|
27206
|
+
const results = {
|
|
27207
|
+
successful: 0,
|
|
27208
|
+
failed: 0,
|
|
27209
|
+
errors: []
|
|
27210
|
+
};
|
|
27211
|
+
for (const school of validatedSchools) {
|
|
27212
|
+
try {
|
|
27213
|
+
const schoolId = await addSchool(school, session);
|
|
27214
|
+
await addRole(
|
|
27215
|
+
{
|
|
27216
|
+
id: schoolId.toString(),
|
|
27217
|
+
type: "basic-edu-school",
|
|
27218
|
+
name: "Admin",
|
|
27219
|
+
permissions: ["*"],
|
|
27220
|
+
status: "active",
|
|
27221
|
+
default: true
|
|
27222
|
+
},
|
|
27223
|
+
session
|
|
27224
|
+
);
|
|
27225
|
+
results.successful++;
|
|
27226
|
+
} catch (error) {
|
|
27227
|
+
results.failed++;
|
|
27228
|
+
results.errors.push(`School "${school.name}": ${error.message}`);
|
|
27229
|
+
}
|
|
27230
|
+
}
|
|
27231
|
+
await session.commitTransaction();
|
|
27232
|
+
return {
|
|
27233
|
+
message: `Bulk upload completed. ${results.successful} schools added successfully.`,
|
|
27234
|
+
details: {
|
|
27235
|
+
successful: results.successful,
|
|
27236
|
+
failed: results.failed,
|
|
27237
|
+
total: validatedSchools.length,
|
|
27238
|
+
totalSizeMB: Math.round(totalSize / 1024 / 1024 * 100) / 100,
|
|
27239
|
+
errors: results.errors
|
|
27240
|
+
}
|
|
27241
|
+
};
|
|
27242
|
+
} catch (error) {
|
|
27243
|
+
logger28.log({
|
|
27244
|
+
level: "error",
|
|
27245
|
+
message: `Error in bulk school upload: ${error.message}`
|
|
27246
|
+
});
|
|
27247
|
+
await session.abortTransaction();
|
|
27248
|
+
throw error;
|
|
27249
|
+
} finally {
|
|
27250
|
+
await session.endSession();
|
|
27251
|
+
}
|
|
27252
|
+
}
|
|
26891
27253
|
return {
|
|
26892
27254
|
register,
|
|
26893
|
-
approve
|
|
27255
|
+
approve,
|
|
27256
|
+
add,
|
|
27257
|
+
addBulk
|
|
26894
27258
|
};
|
|
26895
27259
|
}
|
|
26896
27260
|
|
|
@@ -26899,11 +27263,16 @@ import { BadRequestError as BadRequestError58 } from "@eeplatform/nodejs-utils";
|
|
|
26899
27263
|
import Joi32 from "joi";
|
|
26900
27264
|
function useSchoolController() {
|
|
26901
27265
|
const {
|
|
26902
|
-
add: _add,
|
|
26903
27266
|
getAll: _getAll,
|
|
26904
27267
|
getPendingByCreatedBy: _getPendingByCreatedBy,
|
|
26905
27268
|
updateStatusById: _updateStatusById
|
|
26906
27269
|
} = useSchoolRepo();
|
|
27270
|
+
const {
|
|
27271
|
+
add: _addSchool,
|
|
27272
|
+
register: _registerSchool,
|
|
27273
|
+
approve,
|
|
27274
|
+
addBulk: _addBulk
|
|
27275
|
+
} = useSchoolService();
|
|
26907
27276
|
async function add(req, res, next) {
|
|
26908
27277
|
const payload = req.body;
|
|
26909
27278
|
const { error } = schemaSchool.validate(payload);
|
|
@@ -26912,8 +27281,8 @@ function useSchoolController() {
|
|
|
26912
27281
|
return;
|
|
26913
27282
|
}
|
|
26914
27283
|
try {
|
|
26915
|
-
const
|
|
26916
|
-
res.status(201).json(
|
|
27284
|
+
const result = await _addSchool(payload);
|
|
27285
|
+
res.status(201).json({ message: result });
|
|
26917
27286
|
return;
|
|
26918
27287
|
} catch (error2) {
|
|
26919
27288
|
next(error2);
|
|
@@ -27003,7 +27372,6 @@ function useSchoolController() {
|
|
|
27003
27372
|
next(error2);
|
|
27004
27373
|
}
|
|
27005
27374
|
}
|
|
27006
|
-
const { register: _registerSchool, approve } = useSchoolService();
|
|
27007
27375
|
async function registerSchool(req, res, next) {
|
|
27008
27376
|
const payload = req.body;
|
|
27009
27377
|
const { error } = schemaSchool.validate(payload);
|
|
@@ -27038,13 +27406,38 @@ function useSchoolController() {
|
|
|
27038
27406
|
next(error2);
|
|
27039
27407
|
}
|
|
27040
27408
|
}
|
|
27409
|
+
async function addBulk(req, res, next) {
|
|
27410
|
+
if (!req.file) {
|
|
27411
|
+
res.status(400).send("File is required!");
|
|
27412
|
+
return;
|
|
27413
|
+
}
|
|
27414
|
+
const { region, division } = req.body;
|
|
27415
|
+
const validation = Joi32.object({
|
|
27416
|
+
region: Joi32.string().hex().required(),
|
|
27417
|
+
division: Joi32.string().hex().required()
|
|
27418
|
+
});
|
|
27419
|
+
const { error } = validation.validate({ region, division });
|
|
27420
|
+
if (error) {
|
|
27421
|
+
next(new BadRequestError58(`Validation error: ${error.message}`));
|
|
27422
|
+
return;
|
|
27423
|
+
}
|
|
27424
|
+
try {
|
|
27425
|
+
const result = await _addBulk(req.file, region, division);
|
|
27426
|
+
res.status(201).json(result);
|
|
27427
|
+
return;
|
|
27428
|
+
} catch (error2) {
|
|
27429
|
+
next(error2);
|
|
27430
|
+
return;
|
|
27431
|
+
}
|
|
27432
|
+
}
|
|
27041
27433
|
return {
|
|
27042
27434
|
add,
|
|
27043
27435
|
getAll,
|
|
27044
27436
|
getByCreatedBy,
|
|
27045
27437
|
updateStatusById,
|
|
27046
27438
|
registerSchool,
|
|
27047
|
-
approveSchool
|
|
27439
|
+
approveSchool,
|
|
27440
|
+
addBulk
|
|
27048
27441
|
};
|
|
27049
27442
|
}
|
|
27050
27443
|
|
|
@@ -29534,10 +29927,18 @@ var schemaPlantilla = Joi41.object({
|
|
|
29534
29927
|
_id: Joi41.string().hex().optional().allow(null, ""),
|
|
29535
29928
|
itemNumber: Joi41.string().required(),
|
|
29536
29929
|
positionTitle: Joi41.string().required(),
|
|
29537
|
-
|
|
29538
|
-
|
|
29930
|
+
positionCategory: Joi41.string().required(),
|
|
29931
|
+
region: Joi41.string().hex().optional().allow(null, ""),
|
|
29932
|
+
regionName: Joi41.string().optional().allow(null, ""),
|
|
29933
|
+
division: Joi41.string().hex().optional().allow(null, ""),
|
|
29934
|
+
divisionName: Joi41.string().optional().allow(null, ""),
|
|
29935
|
+
salaryGrade: Joi41.number().required(),
|
|
29936
|
+
step: Joi41.number().optional().allow(null, 0),
|
|
29937
|
+
incumbent: Joi41.string().optional().allow(null, ""),
|
|
29938
|
+
annualSalary: Joi41.number().optional().allow(null, 0),
|
|
29939
|
+
monthlySalary: Joi41.number().optional().allow(null, 0),
|
|
29539
29940
|
status: Joi41.string().required(),
|
|
29540
|
-
|
|
29941
|
+
employee: Joi41.string().hex().optional().allow(null, ""),
|
|
29541
29942
|
createdAt: Joi41.date().iso().optional().allow(null, ""),
|
|
29542
29943
|
updatedAt: Joi41.date().iso().optional().allow(null, ""),
|
|
29543
29944
|
deletedAt: Joi41.date().iso().optional().allow(null, "")
|
|
@@ -29554,21 +29955,21 @@ function MPlantilla(data) {
|
|
|
29554
29955
|
throw new BadRequestError74("Invalid _id.");
|
|
29555
29956
|
}
|
|
29556
29957
|
}
|
|
29557
|
-
if (data.employeeId && typeof data.employeeId === "string") {
|
|
29558
|
-
try {
|
|
29559
|
-
data.employeeId = new ObjectId46(data.employeeId);
|
|
29560
|
-
} catch (error2) {
|
|
29561
|
-
throw new BadRequestError74("Invalid employeeId.");
|
|
29562
|
-
}
|
|
29563
|
-
}
|
|
29564
29958
|
return {
|
|
29565
29959
|
_id: data._id,
|
|
29566
29960
|
itemNumber: data.itemNumber ?? "",
|
|
29567
29961
|
positionTitle: data.positionTitle ?? "",
|
|
29568
|
-
|
|
29569
|
-
officeAssignment: data.officeAssignment ?? "",
|
|
29962
|
+
positionCategory: data.positionCategory ?? "",
|
|
29570
29963
|
status: data.status ?? "active",
|
|
29571
|
-
|
|
29964
|
+
salaryGrade: data.salaryGrade ?? 0,
|
|
29965
|
+
step: data.step ?? 0,
|
|
29966
|
+
monthlySalary: data.monthlySalary ?? 0,
|
|
29967
|
+
annualSalary: data.annualSalary ?? 0,
|
|
29968
|
+
region: data.region ?? "",
|
|
29969
|
+
regionName: data.regionName ?? "",
|
|
29970
|
+
division: data.division ?? "",
|
|
29971
|
+
divisionName: data.divisionName ?? "",
|
|
29972
|
+
incumbent: data.incumbent ?? "",
|
|
29572
29973
|
createdAt: data.createdAt ? new Date(data.createdAt) : /* @__PURE__ */ new Date(),
|
|
29573
29974
|
updatedAt: data.updatedAt ? new Date(data.updatedAt) : "",
|
|
29574
29975
|
deletedAt: data.deletedAt ? new Date(data.deletedAt) : ""
|
|
@@ -29606,11 +30007,14 @@ function usePlantillaRepo() {
|
|
|
29606
30007
|
throw new Error("Failed to create index on plantillas.");
|
|
29607
30008
|
}
|
|
29608
30009
|
}
|
|
29609
|
-
async function add(value, session) {
|
|
30010
|
+
async function add(value, session, clearCache = true) {
|
|
30011
|
+
console.log(value);
|
|
29610
30012
|
try {
|
|
29611
30013
|
value = MPlantilla(value);
|
|
29612
30014
|
const res = await collection.insertOne(value, { session });
|
|
29613
|
-
|
|
30015
|
+
if (clearCache) {
|
|
30016
|
+
delCachedData();
|
|
30017
|
+
}
|
|
29614
30018
|
return res.insertedId;
|
|
29615
30019
|
} catch (error) {
|
|
29616
30020
|
logger36.log({
|
|
@@ -29811,13 +30215,225 @@ function usePlantillaRepo() {
|
|
|
29811
30215
|
getAll,
|
|
29812
30216
|
getById,
|
|
29813
30217
|
updateById,
|
|
29814
|
-
deleteById
|
|
30218
|
+
deleteById,
|
|
30219
|
+
delCachedData
|
|
29815
30220
|
};
|
|
29816
30221
|
}
|
|
29817
30222
|
|
|
29818
30223
|
// src/controllers/plantilla.controller.ts
|
|
29819
|
-
import { BadRequestError as
|
|
30224
|
+
import { BadRequestError as BadRequestError77 } from "@eeplatform/nodejs-utils";
|
|
29820
30225
|
import Joi42 from "joi";
|
|
30226
|
+
|
|
30227
|
+
// src/services/plantilla.service.ts
|
|
30228
|
+
import { BadRequestError as BadRequestError76, useAtlas as useAtlas39, logger as logger37 } from "@eeplatform/nodejs-utils";
|
|
30229
|
+
import * as XLSX2 from "xlsx";
|
|
30230
|
+
import * as Papa2 from "papaparse";
|
|
30231
|
+
function usePlantillaService() {
|
|
30232
|
+
const { add: addPlantilla, delCachedData } = usePlantillaRepo();
|
|
30233
|
+
async function addBulk(file, region, division) {
|
|
30234
|
+
logger37.log({
|
|
30235
|
+
level: "info",
|
|
30236
|
+
message: `Starting plantilla bulk upload. File: ${file.originalname}, Size: ${file.size} bytes`
|
|
30237
|
+
});
|
|
30238
|
+
const MAX_SIZE = 16 * 1024 * 1024;
|
|
30239
|
+
let plantillas = [];
|
|
30240
|
+
let totalSize = 0;
|
|
30241
|
+
let validatedPlantillas = [];
|
|
30242
|
+
if (!file.buffer) {
|
|
30243
|
+
throw new BadRequestError76("File buffer is empty or corrupted");
|
|
30244
|
+
}
|
|
30245
|
+
try {
|
|
30246
|
+
const fileExtension = file.originalname.split(".").pop()?.toLowerCase();
|
|
30247
|
+
if (fileExtension === "csv") {
|
|
30248
|
+
const csvData = file.buffer.toString("utf-8");
|
|
30249
|
+
totalSize = Buffer.byteLength(csvData, "utf8");
|
|
30250
|
+
const parseResult = Papa2.parse(csvData, {
|
|
30251
|
+
header: true,
|
|
30252
|
+
skipEmptyLines: true,
|
|
30253
|
+
transformHeader: (header) => {
|
|
30254
|
+
return header.toLowerCase().replace(/\s+/g, "").replace(/[^\w]/g, "");
|
|
30255
|
+
}
|
|
30256
|
+
});
|
|
30257
|
+
if (parseResult.errors.length > 0) {
|
|
30258
|
+
throw new BadRequestError76(
|
|
30259
|
+
`CSV parsing errors: ${parseResult.errors.map((e) => e.message).join(", ")}`
|
|
30260
|
+
);
|
|
30261
|
+
}
|
|
30262
|
+
plantillas = parseResult.data;
|
|
30263
|
+
} else if (fileExtension === "xlsx" || fileExtension === "xls") {
|
|
30264
|
+
totalSize = file.buffer.length;
|
|
30265
|
+
const workbook = XLSX2.read(file.buffer, { type: "buffer" });
|
|
30266
|
+
const sheetName = workbook.SheetNames[0];
|
|
30267
|
+
const worksheet = workbook.Sheets[sheetName];
|
|
30268
|
+
plantillas = XLSX2.utils.sheet_to_json(worksheet, {
|
|
30269
|
+
header: 1,
|
|
30270
|
+
defval: ""
|
|
30271
|
+
});
|
|
30272
|
+
if (plantillas.length === 0) {
|
|
30273
|
+
throw new BadRequestError76("Excel file is empty.");
|
|
30274
|
+
}
|
|
30275
|
+
const headers = plantillas[0];
|
|
30276
|
+
const normalizedHeaders = headers.map(
|
|
30277
|
+
(header) => header.toLowerCase().replace(/\s+/g, "").replace(/[^\w]/g, "")
|
|
30278
|
+
);
|
|
30279
|
+
plantillas = plantillas.slice(1).map((row) => {
|
|
30280
|
+
const obj = {};
|
|
30281
|
+
normalizedHeaders.forEach((header, index) => {
|
|
30282
|
+
obj[header] = row[index] || "";
|
|
30283
|
+
});
|
|
30284
|
+
return obj;
|
|
30285
|
+
});
|
|
30286
|
+
} else {
|
|
30287
|
+
throw new BadRequestError76(
|
|
30288
|
+
"Unsupported file type. Please upload an Excel (.xlsx, .xls) or CSV (.csv) file."
|
|
30289
|
+
);
|
|
30290
|
+
}
|
|
30291
|
+
if (!plantillas || plantillas.length === 0) {
|
|
30292
|
+
throw new BadRequestError76("No data found in the uploaded file.");
|
|
30293
|
+
}
|
|
30294
|
+
const errors = [];
|
|
30295
|
+
for (let i = 0; i < plantillas.length; i++) {
|
|
30296
|
+
const plantillaData = plantillas[i];
|
|
30297
|
+
const rowNumber = i + 1;
|
|
30298
|
+
try {
|
|
30299
|
+
const itemNumber = plantillaData.itemnumber || plantillaData.item_number || "";
|
|
30300
|
+
const positionTitle = plantillaData.positiontitle || plantillaData.position_title || plantillaData.title || "";
|
|
30301
|
+
const positionCategory = plantillaData.positioncategory || plantillaData.position_category || "";
|
|
30302
|
+
const status = plantillaData.status || "active";
|
|
30303
|
+
if (!itemNumber.trim()) {
|
|
30304
|
+
errors.push(`Row ${rowNumber}: Item Number is required`);
|
|
30305
|
+
continue;
|
|
30306
|
+
}
|
|
30307
|
+
if (!positionTitle.trim()) {
|
|
30308
|
+
errors.push(`Row ${rowNumber}: Position Title is required`);
|
|
30309
|
+
continue;
|
|
30310
|
+
}
|
|
30311
|
+
if (!positionCategory.trim()) {
|
|
30312
|
+
errors.push(`Row ${rowNumber}: Position Category is required`);
|
|
30313
|
+
continue;
|
|
30314
|
+
}
|
|
30315
|
+
const plantilla = {
|
|
30316
|
+
itemNumber: itemNumber.trim(),
|
|
30317
|
+
positionTitle: positionTitle.trim(),
|
|
30318
|
+
positionCategory: positionCategory.trim(),
|
|
30319
|
+
salaryGrade: parseInt(
|
|
30320
|
+
plantillaData.salarygrade || plantillaData.salary_grade || "1"
|
|
30321
|
+
) || 1,
|
|
30322
|
+
step: parseInt(plantillaData.step || "1") || 1,
|
|
30323
|
+
status: status.trim() || "active"
|
|
30324
|
+
};
|
|
30325
|
+
if (region)
|
|
30326
|
+
plantilla.region = region;
|
|
30327
|
+
if (division)
|
|
30328
|
+
plantilla.division = division;
|
|
30329
|
+
if (plantillaData.regionname || plantillaData.region_name) {
|
|
30330
|
+
plantilla.regionName = plantillaData.regionname || plantillaData.region_name;
|
|
30331
|
+
}
|
|
30332
|
+
if (plantillaData.divisionname || plantillaData.division_name) {
|
|
30333
|
+
plantilla.divisionName = plantillaData.divisionname || plantillaData.division_name;
|
|
30334
|
+
}
|
|
30335
|
+
if (plantillaData.incumbent) {
|
|
30336
|
+
plantilla.incumbent = plantillaData.incumbent;
|
|
30337
|
+
}
|
|
30338
|
+
if (plantillaData.employee) {
|
|
30339
|
+
plantilla.employee = plantillaData.employee;
|
|
30340
|
+
}
|
|
30341
|
+
if (plantillaData.annualsalary || plantillaData.annual_salary) {
|
|
30342
|
+
plantilla.annualSalary = parseFloat(
|
|
30343
|
+
plantillaData.annualsalary || plantillaData.annual_salary
|
|
30344
|
+
) || void 0;
|
|
30345
|
+
}
|
|
30346
|
+
if (plantillaData.monthlysalary || plantillaData.monthly_salary) {
|
|
30347
|
+
plantilla.monthlySalary = parseFloat(
|
|
30348
|
+
plantillaData.monthlysalary || plantillaData.monthly_salary
|
|
30349
|
+
) || void 0;
|
|
30350
|
+
}
|
|
30351
|
+
if (!plantilla.itemNumber || !plantilla.positionTitle || !plantilla.positionCategory) {
|
|
30352
|
+
errors.push(`Row ${rowNumber}: Missing required fields`);
|
|
30353
|
+
continue;
|
|
30354
|
+
}
|
|
30355
|
+
validatedPlantillas.push(plantilla);
|
|
30356
|
+
} catch (error) {
|
|
30357
|
+
errors.push(
|
|
30358
|
+
`Row ${rowNumber}: ${error.message || "Invalid data format"}`
|
|
30359
|
+
);
|
|
30360
|
+
}
|
|
30361
|
+
}
|
|
30362
|
+
if (errors.length > 0) {
|
|
30363
|
+
throw new BadRequestError76(
|
|
30364
|
+
`Validation errors found:
|
|
30365
|
+
${errors.slice(0, 10).join("\n")}${errors.length > 10 ? `
|
|
30366
|
+
... and ${errors.length - 10} more errors` : ""}`
|
|
30367
|
+
);
|
|
30368
|
+
}
|
|
30369
|
+
if (validatedPlantillas.length === 0) {
|
|
30370
|
+
throw new BadRequestError76(
|
|
30371
|
+
"No valid plantilla records found after validation."
|
|
30372
|
+
);
|
|
30373
|
+
}
|
|
30374
|
+
if (totalSize > MAX_SIZE) {
|
|
30375
|
+
throw new BadRequestError76(
|
|
30376
|
+
`Data payload (${Math.round(
|
|
30377
|
+
totalSize / 1024 / 1024
|
|
30378
|
+
)}MB) exceeds MongoDB transaction limit of 16MB. Please reduce the number of records or split into smaller files.`
|
|
30379
|
+
);
|
|
30380
|
+
}
|
|
30381
|
+
} catch (error) {
|
|
30382
|
+
if (error instanceof BadRequestError76) {
|
|
30383
|
+
throw error;
|
|
30384
|
+
}
|
|
30385
|
+
throw new BadRequestError76(`File processing error: ${error.message}`);
|
|
30386
|
+
}
|
|
30387
|
+
const session = useAtlas39.getClient()?.startSession();
|
|
30388
|
+
if (!session) {
|
|
30389
|
+
throw new Error("Unable to start session for bulk plantilla upload.");
|
|
30390
|
+
}
|
|
30391
|
+
logger37.log({
|
|
30392
|
+
level: "info",
|
|
30393
|
+
message: `Starting bulk plantilla upload with ${validatedPlantillas.length} records`
|
|
30394
|
+
});
|
|
30395
|
+
try {
|
|
30396
|
+
session.startTransaction();
|
|
30397
|
+
const results = {
|
|
30398
|
+
successful: 0,
|
|
30399
|
+
failed: 0,
|
|
30400
|
+
errors: []
|
|
30401
|
+
};
|
|
30402
|
+
const promises = [];
|
|
30403
|
+
for (let i = 0; i < validatedPlantillas.length; i++) {
|
|
30404
|
+
const plantilla = validatedPlantillas[i];
|
|
30405
|
+
promises.push(addPlantilla(plantilla, session, false));
|
|
30406
|
+
}
|
|
30407
|
+
await Promise.all(promises);
|
|
30408
|
+
await delCachedData();
|
|
30409
|
+
await session.commitTransaction();
|
|
30410
|
+
return {
|
|
30411
|
+
message: `Bulk upload completed. ${results.successful} plantillas added successfully.`,
|
|
30412
|
+
details: {
|
|
30413
|
+
successful: results.successful,
|
|
30414
|
+
failed: results.failed,
|
|
30415
|
+
total: validatedPlantillas.length,
|
|
30416
|
+
totalSizeMB: Math.round(totalSize / 1024 / 1024 * 100) / 100,
|
|
30417
|
+
errors: results.errors
|
|
30418
|
+
}
|
|
30419
|
+
};
|
|
30420
|
+
} catch (error) {
|
|
30421
|
+
logger37.log({
|
|
30422
|
+
level: "error",
|
|
30423
|
+
message: `Error in bulk plantilla upload: ${error.message}`
|
|
30424
|
+
});
|
|
30425
|
+
await session.abortTransaction();
|
|
30426
|
+
throw error;
|
|
30427
|
+
} finally {
|
|
30428
|
+
await session.endSession();
|
|
30429
|
+
}
|
|
30430
|
+
}
|
|
30431
|
+
return {
|
|
30432
|
+
addBulk
|
|
30433
|
+
};
|
|
30434
|
+
}
|
|
30435
|
+
|
|
30436
|
+
// src/controllers/plantilla.controller.ts
|
|
29821
30437
|
function usePlantillaController() {
|
|
29822
30438
|
const {
|
|
29823
30439
|
add: _addPlantilla,
|
|
@@ -29826,19 +30442,18 @@ function usePlantillaController() {
|
|
|
29826
30442
|
updateById: _updatePlantillaById,
|
|
29827
30443
|
deleteById: _deletePlantillaById
|
|
29828
30444
|
} = usePlantillaRepo();
|
|
30445
|
+
const { addBulk: _addBulk } = usePlantillaService();
|
|
29829
30446
|
async function createPlantilla(req, res, next) {
|
|
29830
30447
|
const value = req.body;
|
|
29831
30448
|
const validation = Joi42.object({
|
|
29832
30449
|
itemNumber: Joi42.string().required(),
|
|
29833
30450
|
positionTitle: Joi42.string().required(),
|
|
29834
|
-
|
|
29835
|
-
|
|
29836
|
-
status: Joi42.string().required(),
|
|
29837
|
-
employeeId: Joi42.string().hex().optional().allow(null, "")
|
|
30451
|
+
positionCategory: Joi42.string().required(),
|
|
30452
|
+
status: Joi42.string().required()
|
|
29838
30453
|
});
|
|
29839
30454
|
const { error } = validation.validate(value);
|
|
29840
30455
|
if (error) {
|
|
29841
|
-
next(new
|
|
30456
|
+
next(new BadRequestError77(error.message));
|
|
29842
30457
|
return;
|
|
29843
30458
|
}
|
|
29844
30459
|
try {
|
|
@@ -29856,12 +30471,12 @@ function usePlantillaController() {
|
|
|
29856
30471
|
const org = req.query.org ?? "";
|
|
29857
30472
|
const isPageNumber = isFinite(page);
|
|
29858
30473
|
if (!isPageNumber) {
|
|
29859
|
-
next(new
|
|
30474
|
+
next(new BadRequestError77("Invalid page number."));
|
|
29860
30475
|
return;
|
|
29861
30476
|
}
|
|
29862
30477
|
const isLimitNumber = isFinite(limit);
|
|
29863
30478
|
if (!isLimitNumber) {
|
|
29864
|
-
next(new
|
|
30479
|
+
next(new BadRequestError77("Invalid limit number."));
|
|
29865
30480
|
return;
|
|
29866
30481
|
}
|
|
29867
30482
|
const validation = Joi42.object({
|
|
@@ -29872,7 +30487,7 @@ function usePlantillaController() {
|
|
|
29872
30487
|
});
|
|
29873
30488
|
const { error } = validation.validate({ page, limit, search, org });
|
|
29874
30489
|
if (error) {
|
|
29875
|
-
next(new
|
|
30490
|
+
next(new BadRequestError77(error.message));
|
|
29876
30491
|
return;
|
|
29877
30492
|
}
|
|
29878
30493
|
try {
|
|
@@ -29895,13 +30510,13 @@ function usePlantillaController() {
|
|
|
29895
30510
|
});
|
|
29896
30511
|
const { error } = validation.validate({ id });
|
|
29897
30512
|
if (error) {
|
|
29898
|
-
next(new
|
|
30513
|
+
next(new BadRequestError77(error.message));
|
|
29899
30514
|
return;
|
|
29900
30515
|
}
|
|
29901
30516
|
try {
|
|
29902
30517
|
const plantilla = await _getPlantillaById(id);
|
|
29903
30518
|
if (!plantilla) {
|
|
29904
|
-
next(new
|
|
30519
|
+
next(new BadRequestError77("Plantilla not found."));
|
|
29905
30520
|
return;
|
|
29906
30521
|
}
|
|
29907
30522
|
res.json(plantilla);
|
|
@@ -29915,19 +30530,20 @@ function usePlantillaController() {
|
|
|
29915
30530
|
const value = req.body;
|
|
29916
30531
|
const validation = Joi42.object({
|
|
29917
30532
|
id: Joi42.string().hex().required(),
|
|
29918
|
-
|
|
30533
|
+
employee: Joi42.string().hex().optional().allow(null, ""),
|
|
29919
30534
|
status: Joi42.string().optional(),
|
|
29920
|
-
positionTitle: Joi42.string().optional()
|
|
30535
|
+
positionTitle: Joi42.string().optional(),
|
|
30536
|
+
positionCategory: Joi42.string().optional()
|
|
29921
30537
|
});
|
|
29922
30538
|
const { error } = validation.validate({ id, ...value });
|
|
29923
30539
|
if (error) {
|
|
29924
|
-
next(new
|
|
30540
|
+
next(new BadRequestError77(error.message));
|
|
29925
30541
|
return;
|
|
29926
30542
|
}
|
|
29927
30543
|
try {
|
|
29928
30544
|
const result = await _updatePlantillaById(id, value);
|
|
29929
30545
|
if (result.matchedCount === 0) {
|
|
29930
|
-
next(new
|
|
30546
|
+
next(new BadRequestError77("Plantilla not found."));
|
|
29931
30547
|
return;
|
|
29932
30548
|
}
|
|
29933
30549
|
res.json({ message: "Plantilla updated successfully" });
|
|
@@ -29943,13 +30559,13 @@ function usePlantillaController() {
|
|
|
29943
30559
|
});
|
|
29944
30560
|
const { error } = validation.validate({ id });
|
|
29945
30561
|
if (error) {
|
|
29946
|
-
next(new
|
|
30562
|
+
next(new BadRequestError77(error.message));
|
|
29947
30563
|
return;
|
|
29948
30564
|
}
|
|
29949
30565
|
try {
|
|
29950
30566
|
const result = await _deletePlantillaById(id);
|
|
29951
30567
|
if (result.matchedCount === 0) {
|
|
29952
|
-
next(new
|
|
30568
|
+
next(new BadRequestError77("Plantilla not found."));
|
|
29953
30569
|
return;
|
|
29954
30570
|
}
|
|
29955
30571
|
res.json({ message: "Plantilla deleted successfully" });
|
|
@@ -29958,12 +30574,45 @@ function usePlantillaController() {
|
|
|
29958
30574
|
next(error2);
|
|
29959
30575
|
}
|
|
29960
30576
|
}
|
|
30577
|
+
async function bulkAddPlantillas(req, res, next) {
|
|
30578
|
+
if (!req.file) {
|
|
30579
|
+
res.status(400).send("File is required!");
|
|
30580
|
+
return;
|
|
30581
|
+
}
|
|
30582
|
+
const { region, division } = req.body;
|
|
30583
|
+
const validation = Joi42.object({
|
|
30584
|
+
region: Joi42.string().hex().optional(),
|
|
30585
|
+
division: Joi42.string().hex().optional()
|
|
30586
|
+
});
|
|
30587
|
+
const { error } = validation.validate({ region, division });
|
|
30588
|
+
if (error) {
|
|
30589
|
+
next(new BadRequestError77(`Validation error: ${error.message}`));
|
|
30590
|
+
return;
|
|
30591
|
+
}
|
|
30592
|
+
if (!region && !division) {
|
|
30593
|
+
next(
|
|
30594
|
+
new BadRequestError77(
|
|
30595
|
+
"At least one of region or division must be provided"
|
|
30596
|
+
)
|
|
30597
|
+
);
|
|
30598
|
+
return;
|
|
30599
|
+
}
|
|
30600
|
+
try {
|
|
30601
|
+
const result = await _addBulk(req.file, region, division);
|
|
30602
|
+
res.status(201).json(result);
|
|
30603
|
+
return;
|
|
30604
|
+
} catch (error2) {
|
|
30605
|
+
next(error2);
|
|
30606
|
+
return;
|
|
30607
|
+
}
|
|
30608
|
+
}
|
|
29961
30609
|
return {
|
|
29962
30610
|
createPlantilla,
|
|
29963
30611
|
getAllPlantillas,
|
|
29964
30612
|
getPlantillaById,
|
|
29965
30613
|
updatePlantilla,
|
|
29966
|
-
deletePlantilla
|
|
30614
|
+
deletePlantilla,
|
|
30615
|
+
bulkAddPlantillas
|
|
29967
30616
|
};
|
|
29968
30617
|
}
|
|
29969
30618
|
export {
|