se crearon endpoints para traer datos de los servicios por periodo

package-lock.json

@@ -19,7 +19,6 @@
         "@nestjs/typeorm": "^11.0.0",
         "class-transformer": "^0.5.1",
         "class-validator": "^0.14.2",
-        "ldapts": "^8.1.7",
         "mysql2": "^3.14.4",
         "passport": "^0.7.0",
         "passport-jwt": "^4.0.1",
@@ -877,20 +876,20 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.3.4",
+      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz",
-      "integrity": "sha512-4h4MVF8pmBsncB60r0wSJiIeUKTSD4m7FmTFThG8RHlsg9ajqckLm9OraguFGZE4vVdpiI1Q4+hFnisopmG6gQ==",
+      "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ajv": "^6.14.0",
+        "ajv": "^6.12.4",
         "debug": "^4.3.2",
         "espree": "^10.0.1",
         "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.1",
-        "minimatch": "^3.1.3",
+        "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
@@ -914,9 +913,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.39.3",
+      "version": "9.39.2",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.3.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz",
-      "integrity": "sha512-1B1VkCq6FuUNlQvlBYb+1jDu/gV297TIs/OeiaSR9l1H27SVW55ONE1e1Vp16NqP683+xEGzxYtv4XCiDPaQiw==",
+      "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1417,12 +1416,12 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.2.0",
+      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^6.2.2"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
         "node": ">=12"
@@ -1825,13 +1824,13 @@
       "license": "ISC"
     },
     "node_modules/@jest/reporters/node_modules/minimatch": {
-      "version": "9.0.9",
+      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.2"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -2409,14 +2408,14 @@
       }
     },
     "node_modules/@nestjs/platform-express": {
-      "version": "11.1.16",
+      "version": "11.1.14",
-      "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-11.1.16.tgz",
+      "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-11.1.14.tgz",
-      "integrity": "sha512-IOegr5+ZfUiMKgk+garsSU4MOkPRhm46e6w8Bp1GcO4vCdl9Piz6FlWAzKVfa/U3Hn/DdzSVJOW3TWcQQFdBDw==",
+      "integrity": "sha512-Fs+/j+mBSBSXErOQJ/YdUn/HqJGSJ4pGfiJyYOyz04l42uNVnqEakvu1kXLbxMabR6vd6/h9d6Bi4tso9p7o4Q==",
       "license": "MIT",
       "dependencies": {
         "cors": "2.8.6",
         "express": "5.2.1",
-        "multer": "2.1.1",
+        "multer": "2.0.2",
         "path-to-regexp": "8.3.0",
         "tslib": "2.8.1"
       },
@@ -2928,9 +2927,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.19.13",
+      "version": "22.19.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.13.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.11.tgz",
-      "integrity": "sha512-akNQMv0wW5uyRpD2v2IEyRSZiR+BeGuoB6L310EgGObO44HSMNT8z1xzio28V8qOrgYaopIDNA18YgdXd+qTiw==",
+      "integrity": "sha512-BH7YwL6rA93ReqeQS1c4bsPpcfOmJasG+Fkr6Y59q83f9M1WcBRHR2vM+P9eOisYRcN3ujQoiZY8uk5W+1WL8w==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
@@ -3058,17 +3057,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.56.1",
+      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.0.tgz",
-      "integrity": "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==",
+      "integrity": "sha512-lRyPDLzNCuae71A3t9NEINBiTn7swyOhvUj3MyUOxb8x6g6vPEFoOU+ZRmGMusNC3X3YMhqMIX7i8ShqhT74Pw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.56.1",
+        "@typescript-eslint/scope-manager": "8.56.0",
-        "@typescript-eslint/type-utils": "8.56.1",
+        "@typescript-eslint/type-utils": "8.56.0",
-        "@typescript-eslint/utils": "8.56.1",
+        "@typescript-eslint/utils": "8.56.0",
-        "@typescript-eslint/visitor-keys": "8.56.1",
+        "@typescript-eslint/visitor-keys": "8.56.0",
         "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
         "ts-api-utils": "^2.4.0"
@@ -3081,7 +3080,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.56.1",
+        "@typescript-eslint/parser": "^8.56.0",
         "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
@@ -3097,16 +3096,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.56.1",
+      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.0.tgz",
-      "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
+      "integrity": "sha512-IgSWvLobTDOjnaxAfDTIHaECbkNlAlKv2j5SjpB2v7QHKv1FIfjwMy8FsDbVfDX/KjmCmYICcw7uGaXLhtsLNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.56.1",
+        "@typescript-eslint/scope-manager": "8.56.0",
-        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/types": "8.56.0",
-        "@typescript-eslint/typescript-estree": "8.56.1",
+        "@typescript-eslint/typescript-estree": "8.56.0",
-        "@typescript-eslint/visitor-keys": "8.56.1",
+        "@typescript-eslint/visitor-keys": "8.56.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -3122,14 +3121,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.56.1",
+      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.0.tgz",
-      "integrity": "sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==",
+      "integrity": "sha512-M3rnyL1vIQOMeWxTWIW096/TtVP+8W3p/XnaFflhmcFp+U4zlxUxWj4XwNs6HbDeTtN4yun0GNTTDBw/SvufKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.56.1",
+        "@typescript-eslint/tsconfig-utils": "^8.56.0",
-        "@typescript-eslint/types": "^8.56.1",
+        "@typescript-eslint/types": "^8.56.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -3144,14 +3143,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.56.1",
+      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.0.tgz",
-      "integrity": "sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==",
+      "integrity": "sha512-7UiO/XwMHquH+ZzfVCfUNkIXlp/yQjjnlYUyYz7pfvlK3/EyyN6BK+emDmGNyQLBtLGaYrTAI6KOw8tFucWL2w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/types": "8.56.0",
-        "@typescript-eslint/visitor-keys": "8.56.1"
+        "@typescript-eslint/visitor-keys": "8.56.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3162,9 +3161,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.56.1",
+      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.0.tgz",
-      "integrity": "sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==",
+      "integrity": "sha512-bSJoIIt4o3lKXD3xmDh9chZcjCz5Lk8xS7Rxn+6l5/pKrDpkCwtQNQQwZ2qRPk7TkUYhrq3WPIHXOXlbXP0itg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3179,15 +3178,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.56.1",
+      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.0.tgz",
-      "integrity": "sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==",
+      "integrity": "sha512-qX2L3HWOU2nuDs6GzglBeuFXviDODreS58tLY/BALPC7iu3Fa+J7EOTwnX9PdNBxUI7Uh0ntP0YWGnxCkXzmfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/types": "8.56.0",
-        "@typescript-eslint/typescript-estree": "8.56.1",
+        "@typescript-eslint/typescript-estree": "8.56.0",
-        "@typescript-eslint/utils": "8.56.1",
+        "@typescript-eslint/utils": "8.56.0",
         "debug": "^4.4.3",
         "ts-api-utils": "^2.4.0"
       },
@@ -3204,9 +3203,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.56.1",
+      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.0.tgz",
-      "integrity": "sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==",
+      "integrity": "sha512-DBsLPs3GsWhX5HylbP9HNG15U0bnwut55Lx12bHB9MpXxQ+R5GC8MwQe+N1UFXxAeQDvEsEDY6ZYwX03K7Z6HQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3218,18 +3217,18 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.56.1",
+      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.0.tgz",
-      "integrity": "sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==",
+      "integrity": "sha512-ex1nTUMWrseMltXUHmR2GAQ4d+WjkZCT4f+4bVsps8QEdh0vlBsaCokKTPlnqBFqqGaxilDNJG7b8dolW2m43Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.56.1",
+        "@typescript-eslint/project-service": "8.56.0",
-        "@typescript-eslint/tsconfig-utils": "8.56.1",
+        "@typescript-eslint/tsconfig-utils": "8.56.0",
-        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/types": "8.56.0",
-        "@typescript-eslint/visitor-keys": "8.56.1",
+        "@typescript-eslint/visitor-keys": "8.56.0",
         "debug": "^4.4.3",
-        "minimatch": "^10.2.2",
+        "minimatch": "^9.0.5",
         "semver": "^7.7.3",
         "tinyglobby": "^0.2.15",
         "ts-api-utils": "^2.4.0"
@@ -3245,56 +3244,43 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "5.0.4",
+      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^4.0.2"
+        "balanced-match": "^1.0.0"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-      "version": "10.2.4",
+      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
-      "license": "BlueOak-1.0.0",
+      "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^5.0.2"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "18 || 20 || >=22"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.56.1",
+      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.0.tgz",
-      "integrity": "sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==",
+      "integrity": "sha512-RZ3Qsmi2nFGsS+n+kjLAYDPVlrzf7UhTffrDIKr+h2yzAlYP/y5ZulU0yeDEPItos2Ph46JAL5P/On3pe7kDIQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.56.1",
+        "@typescript-eslint/scope-manager": "8.56.0",
-        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/types": "8.56.0",
-        "@typescript-eslint/typescript-estree": "8.56.1"
+        "@typescript-eslint/typescript-estree": "8.56.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3309,13 +3295,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.56.1",
+      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.0.tgz",
-      "integrity": "sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==",
+      "integrity": "sha512-q+SL+b+05Ud6LbEE35qe4A99P+htKTKVbyiNEe45eCbJFyh/HVK9QXwlrbz+Q4L8SOW4roxSVwXYj4DMBT7Ieg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/types": "8.56.0",
         "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
@@ -3327,9 +3313,9 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "5.0.1",
+      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.0.tgz",
-      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
+      "integrity": "sha512-A0XeIi7CXU7nPlfHS9loMYEKxUaONu/hTEzHTGba9Huu94Cq1hPivf+DE5erJozZOky0LfvXAyrV/tcswpLI0Q==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -3804,9 +3790,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.16.0",
+      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "devOptional": true,
       "license": "MIT",
       "bin": {
@@ -3840,9 +3826,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.3.5",
+      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-      "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -3853,9 +3839,9 @@
       }
     },
     "node_modules/ajv": {
-      "version": "6.14.0",
+      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4207,16 +4193,13 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.0",
+      "version": "2.9.19",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz",
-      "integrity": "sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==",
+      "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
-        "baseline-browser-mapping": "dist/cli.cjs"
+        "baseline-browser-mapping": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
       }
     },
     "node_modules/bl": {
@@ -4461,9 +4444,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001775",
+      "version": "1.0.30001770",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001775.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001770.tgz",
-      "integrity": "sha512-s3Qv7Lht9zbVKE9XoTyRG6wVDCKdtOFIjBGg3+Yhn6JaytuNKPIjBMTMIY1AnOH3seL5mvF+x33oGAyK3hVt3A==",
+      "integrity": "sha512-x/2CLQ1jHENRbHg5PSId2sXq1CIO1CISvwWAj027ltMVG2UNgW+w9oH2+HzgEIRFembL8bUlXtfbBHR1fCg2xw==",
       "dev": true,
       "funding": [
         {
@@ -4571,14 +4554,14 @@
       "license": "MIT"
     },
     "node_modules/class-validator": {
-      "version": "0.14.4",
+      "version": "0.14.3",
-      "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.4.tgz",
+      "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.3.tgz",
-      "integrity": "sha512-AwNusCCam51q703dW82x95tOqQp6oC9HNUl724KxJJOfnKscI8dOloXFgyez7LbTTKWuRBA37FScqVbJEoq8Yw==",
+      "integrity": "sha512-rXXekcjofVN1LTOSw+u4u9WXVEUvNBVjORW154q/IdmYWy1nMbOU9aNtZB0t8m+FJQ9q91jlr2f9CwwUFdFMRA==",
       "license": "MIT",
       "dependencies": {
         "@types/validator": "^13.15.3",
         "libphonenumber-js": "^1.11.1",
-        "validator": "^13.15.22"
+        "validator": "^13.15.20"
       }
     },
     "node_modules/cli-cursor": {
@@ -4939,9 +4922,9 @@
       }
     },
     "node_modules/dedent": {
-      "version": "1.7.2",
+      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.1.tgz",
-      "integrity": "sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==",
+      "integrity": "sha512-9JmrhGZpOlEgOLdQgSm0zxFaYoQon408V1v49aqTWuXENVlnCuY9JBZcXZiCsZQWDjTm5Qf/nIvAy77mXDAjEg==",
       "license": "MIT",
       "peerDependencies": {
         "babel-plugin-macros": "^3.1.0"
@@ -5133,9 +5116,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.302",
+      "version": "1.5.286",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.302.tgz",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz",
-      "integrity": "sha512-sM6HAN2LyK82IyPBpznDRqlTQAtuSaO+ShzFiWTvoMJLHyZ+Y39r8VMfHzwbU8MVBzQ4Wdn85+wlZl2TLGIlwg==",
+      "integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A==",
       "dev": true,
       "license": "ISC"
     },
@@ -5168,9 +5151,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.20.0",
+      "version": "5.19.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.0.tgz",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.19.0.tgz",
-      "integrity": "sha512-/ce7+jQ1PQ6rVXwe+jKEg5hW5ciicHwIQUagZkp6IufBoY3YDgdTTY1azVs0qoRgVmvsNB+rbjLJxDAeHHtwsQ==",
+      "integrity": "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5273,9 +5256,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.39.3",
+      "version": "9.39.2",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.3.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz",
-      "integrity": "sha512-VmQ+sifHUbI/IcSopBCF/HO3YiHQx/AVd3UVyYL6weuwW+HvON9VYn5l6Zl1WZzPWXPNZrSQpxwkkZ/VuvJZzg==",
+      "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5285,7 +5268,7 @@
         "@eslint/config-helpers": "^0.4.2",
         "@eslint/core": "^0.17.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.39.3",
+        "@eslint/js": "9.39.2",
         "@eslint/plugin-kit": "^0.4.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -5784,9 +5767,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.4",
+      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-3+mMldrTAPdta5kjX2G2J7iX4zxtnwpdA8Tr2ZSjkyPSanvbZAcy6flmtnXbEybHrDcU9641lxrMfFuUxVz9vA==",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
       "dev": true,
       "license": "ISC"
     },
@@ -6105,39 +6088,39 @@
       "license": "BSD-2-Clause"
     },
     "node_modules/glob/node_modules/balanced-match": {
-      "version": "4.0.4",
+      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.3.tgz",
-      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "integrity": "sha512-1pHv8LX9CpKut1Zp4EXey7Z8OfH11ONNH6Dhi2WDUt31VVZFXZzKwXcysBgqSumFCmR+0dqjMK5v5JiFHzi0+g==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
       }
     },
     "node_modules/glob/node_modules/brace-expansion": {
-      "version": "5.0.4",
+      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.2.tgz",
-      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
+      "integrity": "sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^4.0.2"
       },
       "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
       }
     },
     "node_modules/glob/node_modules/minimatch": {
-      "version": "10.2.4",
+      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.1.tgz",
-      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+      "integrity": "sha512-MClCe8IL5nRRmawL6ib/eT4oLyeKMGCghibcDWK+J0hh0Q8kqSdia6BvbRMVk6mPa6WqUa5uR2oxt6C5jd533A==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "brace-expansion": "^5.0.2"
       },
       "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -6865,13 +6848,13 @@
       "license": "ISC"
     },
     "node_modules/jest-config/node_modules/minimatch": {
-      "version": "9.0.9",
+      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.2"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -7244,13 +7227,13 @@
       "license": "ISC"
     },
     "node_modules/jest-runtime/node_modules/minimatch": {
-      "version": "9.0.9",
+      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.2"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -7558,18 +7541,6 @@
         "json-buffer": "3.0.1"
       }
     },
-    "node_modules/ldapts": {
-      "version": "8.1.7",
-      "resolved": "https://registry.npmjs.org/ldapts/-/ldapts-8.1.7.tgz",
-      "integrity": "sha512-TJl6T92eIwMf/OJ0hDfKVa6ISwzo+lqCWCI5Mf//ARlKa3LKQZaSrme/H2rCRBhW0DZCQlrsV+fgoW5YHRNLUw==",
-      "license": "MIT",
-      "dependencies": {
-        "strict-event-emitter-types": "2.0.0"
-      },
-      "engines": {
-        "node": ">=20"
-      }
-    },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -7595,9 +7566,9 @@
       }
     },
     "node_modules/libphonenumber-js": {
-      "version": "1.12.38",
+      "version": "1.12.37",
-      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.38.tgz",
+      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.37.tgz",
-      "integrity": "sha512-vwzxmasAy9hZigxtqTbFEwp8ZdZ975TiqVDwj5bKx5sR+zi5ucUQy9mbVTkKM9GzqdLdxux/hTw2nmN5J7POMA==",
+      "integrity": "sha512-rDU6bkpuMs8YRt/UpkuYEAsYSoNuDEbrE41I3KNvmXREGH6DGBJ8Wbak4by29wNOQ27zk4g4HL82zf0OGhwRuw==",
       "license": "MIT"
     },
     "node_modules/lines-and-columns": {
@@ -7945,9 +7916,9 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.1.5",
+      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -7961,7 +7932,6 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7976,6 +7946,18 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
+    "node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -7983,22 +7965,21 @@
       "license": "MIT"
     },
     "node_modules/multer": {
-      "version": "2.1.1",
+      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-2.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz",
-      "integrity": "sha512-mo+QTzKlx8R7E5ylSXxWzGoXoZbOsRMpyitcht8By2KHvMbf3tjwosZ/Mu/XYU6UuJ3VZnODIrak5ZrPiPyB6A==",
+      "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==",
       "license": "MIT",
       "dependencies": {
         "append-field": "^1.0.0",
         "busboy": "^1.6.0",
         "concat-stream": "^2.0.0",
-        "type-is": "^1.6.18"
+        "mkdirp": "^0.5.6",
+        "object-assign": "^4.1.1",
+        "type-is": "^1.6.18",
+        "xtend": "^4.0.2"
       },
       "engines": {
         "node": ">= 10.16.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/multer/node_modules/media-typer": {
@@ -8055,9 +8036,9 @@
       }
     },
     "node_modules/mysql2": {
-      "version": "3.18.2",
+      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.18.2.tgz",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.17.2.tgz",
-      "integrity": "sha512-UfEShBFAZZEAKjySnTUuE7BgqkYT4mx+RjoJ5aqtmwSSvNcJ/QxQPXz/y3jSxNiVRedPfgccmuBtiPCSiEEytw==",
+      "integrity": "sha512-/tFCtdqk5V5Aowpnzshryxuxp63ti4I7kcp3yqAKgWmhYXEXs8+F/IbQ6JTMzQPYc+ElnnhmMD2SqUYLtRVcTQ==",
       "license": "MIT",
       "dependencies": {
         "aws-ssl-profiles": "^1.1.2",
@@ -8065,15 +8046,13 @@
         "generate-function": "^2.3.1",
         "iconv-lite": "^0.7.2",
         "long": "^5.3.2",
-        "lru.min": "^1.1.4",
+        "lru.min": "^1.1.3",
         "named-placeholders": "^1.1.6",
+        "seq-queue": "^0.0.5",
         "sql-escaper": "^1.3.3"
       },
       "engines": {
         "node": ">= 8.0"
-      },
-      "peerDependencies": {
-        "@types/node": ">= 8"
       }
     },
     "node_modules/named-placeholders": {
@@ -8436,9 +8415,9 @@
       }
     },
     "node_modules/path-scurry": {
-      "version": "2.0.2",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
-      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
+      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
@@ -8446,7 +8425,7 @@
         "minipass": "^7.1.2"
       },
       "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -8727,6 +8706,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "node_modules/range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -8973,6 +8962,21 @@
         "url": "https://opencollective.com/express"
       }
     },
+    "node_modules/seq-queue": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz",
+      "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
     "node_modules/serve-static": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz",
@@ -9259,12 +9263,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/strict-event-emitter-types": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strict-event-emitter-types/-/strict-event-emitter-types-2.0.0.tgz",
-      "integrity": "sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==",
-      "license": "ISC"
-    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -9500,15 +9498,16 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.17",
+      "version": "5.3.16",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.17.tgz",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz",
-      "integrity": "sha512-YR7PtUp6GMU91BgSJmlaX/rS2lGDbAF7D+Wtq7hRO+MiljNmodYvqslzCFiYVAgW+Qoaaia/QUIP4lGXufjdZw==",
+      "integrity": "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
         "schema-utils": "^4.3.0",
+        "serialize-javascript": "^6.0.2",
         "terser": "^5.31.1"
       },
       "engines": {
@@ -10210,12 +10209,12 @@
       "license": "ISC"
     },
     "node_modules/typeorm/node_modules/minimatch": {
-      "version": "9.0.9",
+      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.2"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -10255,16 +10254,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.56.1",
+      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.1.tgz",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.0.tgz",
-      "integrity": "sha512-U4lM6pjmBX7J5wk4szltF7I1cGBHXZopnAXCMXb3+fZ3B/0Z3hq3wS/CCUB2NZBNAExK92mCU2tEohWuwVMsDQ==",
+      "integrity": "sha512-c7toRLrotJ9oixgdW7liukZpsnq5CZ7PuKztubGYlNppuTqhIoWfhgHo/7EU0v06gS2l/x0i2NEFK1qMIf0rIg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.56.1",
+        "@typescript-eslint/eslint-plugin": "8.56.0",
-        "@typescript-eslint/parser": "8.56.1",
+        "@typescript-eslint/parser": "8.56.0",
-        "@typescript-eslint/typescript-estree": "8.56.1",
+        "@typescript-eslint/typescript-estree": "8.56.0",
-        "@typescript-eslint/utils": "8.56.1"
+        "@typescript-eslint/utils": "8.56.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -10520,9 +10519,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.105.3",
+      "version": "5.105.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.3.tgz",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.2.tgz",
-      "integrity": "sha512-LLBBA4oLmT7sZdHiYE/PeVuifOxYyE2uL/V+9VQP7YSYdJU7bSf7H8bZRRxW8kEPMkmVjnrXmoR3oejIdX0xbg==",
+      "integrity": "sha512-dRXm0a2qcHPUBEzVk8uph0xWSjV/xZxenQQbLwnwP7caQCYpqG1qddwlyEkIDkYn0K8tvmcrZ+bOrzoQ3HxCDw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -10533,7 +10532,7 @@
         "@webassemblyjs/ast": "^1.14.1",
         "@webassemblyjs/wasm-edit": "^1.14.1",
         "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.16.0",
+        "acorn": "^8.15.0",
         "acorn-import-phases": "^1.0.3",
         "browserslist": "^4.28.1",
         "chrome-trace-event": "^1.0.2",
@@ -10551,7 +10550,7 @@
         "tapable": "^2.3.0",
         "terser-webpack-plugin": "^5.3.16",
         "watchpack": "^2.5.1",
-        "webpack-sources": "^3.3.4"
+        "webpack-sources": "^3.3.3"
       },
       "bin": {
         "webpack": "bin/webpack.js"
@@ -10826,6 +10825,15 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",

package.json

@@ -30,7 +30,6 @@
     "@nestjs/typeorm": "^11.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
-    "ldapts": "^8.1.7",
     "mysql2": "^3.14.4",
     "passport": "^0.7.0",
     "passport-jwt": "^4.0.1",

src/active-directory/active-directory.controller.spec.ts

@@ -1,20 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { ActiveDirectoryController } from './active-directory.controller';
-import { ActiveDirectoryService } from './active-directory.service';
-
-describe('ActiveDirectoryController', () => {
-  let controller: ActiveDirectoryController;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      controllers: [ActiveDirectoryController],
-      providers: [ActiveDirectoryService],
-    }).compile();
-
-    controller = module.get<ActiveDirectoryController>(ActiveDirectoryController);
-  });
-
-  it('should be defined', () => {
-    expect(controller).toBeDefined();
-  });
-});

src/active-directory/active-directory.controller.ts

@@ -1,28 +0,0 @@
-import { Controller, Post, Body, Param } from '@nestjs/common';
-import { ActiveDirectoryService } from './active-directory.service';
-
-@Controller('active-directory')
-export class ActiveDirectoryController {
-  constructor(private readonly adService: ActiveDirectoryService) {}
-
-  @Post('crear/:cuenta')
-  async crearUsuario(@Param('cuenta') cuenta: string) {
-    await this.adService.createUser(cuenta);
-    return { message: `Usuario ${cuenta} creado en AD` };
-  }
-
-  @Post('reset/:cuenta')
-  async resetPassword(@Param('cuenta') cuenta: string) {
-    await this.adService.resetPassword(cuenta);
-    return { message: `Contraseña de ${cuenta} reseteada` };
-  }
-
-  @Post('cambiar-password/:cuenta')
-  async cambiarPassword(
-    @Param('cuenta') cuenta: string,
-    @Body('password') password?: string,
-  ) {
-    await this.adService.changePassword(cuenta, password);
-    return { message: `Contraseña de ${cuenta} actualizada` };
-  }
-}

src/active-directory/active-directory.module.ts

@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-import { ConfigModule } from '@nestjs/config';
-import { ActiveDirectoryService } from './active-directory.service';
-import { ActiveDirectoryController } from './active-directory.controller';
-
-@Module({
-  imports: [ConfigModule],
-  providers: [ActiveDirectoryService],
-  controllers: [ActiveDirectoryController],
-  exports: [ActiveDirectoryService],
-})
-export class ActiveDirectoryModule {}

src/active-directory/active-directory.service.spec.ts

@@ -1,18 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { ActiveDirectoryService } from './active-directory.service';
-
-describe('ActiveDirectoryService', () => {
-  let service: ActiveDirectoryService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [ActiveDirectoryService],
-    }).compile();
-
-    service = module.get<ActiveDirectoryService>(ActiveDirectoryService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});

src/active-directory/active-directory.service.ts

@@ -1,124 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { Client, Attribute, Change } from 'ldapts';
-
-@Injectable()
-export class ActiveDirectoryService {
-  private readonly logger = new Logger(ActiveDirectoryService.name);
-
-  constructor(private configService: ConfigService) { }
-
-  private createClient(): Client {
-    return new Client({
-      url: this.configService.get<string>('AD_URL')!,
-      tlsOptions: { rejectUnauthorized: false },
-    });
-  }
-
-  async createUser(cuenta: string): Promise<void> {
-    const client = this.createClient();
-    const bindDN = this.configService.get<string>('AD_BIND_DN')!;
-    const bindPass = this.configService.get<string>('AD_BIND_PASS')!;
-    const baseDN = this.configService.get<string>('AD_BASE_DN')!;
-
-    try {
-      await client.bind(bindDN, bindPass);
-
-      const userDN = `CN=${cuenta},${baseDN}`;
-
-      await client.add(userDN, {
-        objectClass: ['top', 'person', 'organizationalPerson', 'user'],
-        sAMAccountName: cuenta,
-        cn: cuenta,
-        description: 'Creado desde el Sitio',
-        userAccountControl: '32',
-      });
-
-      const encodedPassword = Buffer.from(`"${cuenta}"`, 'utf16le');
-
-      await client.modify(userDN, [
-        new Change({
-          operation: 'replace',
-          modification: new Attribute({ type: 'unicodePwd', values: [encodedPassword] }),
-        }),
-      ]);
-
-      await client.modify(userDN, [
-        new Change({
-          operation: 'replace',
-          modification: new Attribute({ type: 'pwdLastSet', values: ['0'] }),
-        }),
-      ]);
-
-      await client.modify(userDN, [
-        new Change({
-          operation: 'replace',
-          modification: new Attribute({ type: 'userAccountControl', values: ['512'] }),
-        }),
-      ]);
-
-      this.logger.log(`Usuario ${cuenta} creado exitosamente en AD`);
-    } catch (error) {
-      this.logger.error(`Error al crear usuario ${cuenta} en AD`, error);
-      throw error;
-    } finally {
-      await client.unbind();
-    }
-  }
-
-  async resetPassword(cuenta: string): Promise<void> {
-    const client = this.createClient();
-    const bindDN = this.configService.get<string>('AD_BIND_DN')!;
-    const bindPass = this.configService.get<string>('AD_BIND_PASS')!;
-    const baseDN = this.configService.get<string>('AD_BASE_DN')!;
-
-    try {
-      await client.bind(bindDN, bindPass);
-      const userDN = `CN=${cuenta},${baseDN}`;
-      await client.del(userDN);
-      this.logger.log(`Usuario ${cuenta} eliminado de AD`);
-    } catch (error) {
-      this.logger.warn(`No se pudo eliminar ${cuenta} de AD (puede no existir)`, error);
-    } finally {
-      await client.unbind();
-    }
-
-    await this.createUser(cuenta);
-  }
-
-  async changePassword(cuenta: string, newPass?: string): Promise<void> {
-    const client = this.createClient();
-    const bindDN = this.configService.get<string>('AD_BIND_DN')!;
-    const bindPass = this.configService.get<string>('AD_BIND_PASS')!;
-    const baseDN = this.configService.get<string>('AD_BASE_DN')!;
-    const password = newPass ?? cuenta;
-
-    try {
-      await client.bind(bindDN, bindPass);
-
-      const userDN = `CN=${cuenta},${baseDN}`;
-      const encodedPassword = Buffer.from(`"${password}"`, 'utf16le');
-
-      await client.modify(userDN, [
-        new Change({
-          operation: 'replace',
-          modification: new Attribute({ type: 'unicodePwd', values: [encodedPassword] }),
-        }),
-      ]);
-
-      await client.modify(userDN, [
-        new Change({
-          operation: 'replace',
-          modification: new Attribute({ type: 'pwdLastSet', values: ['0'] }),
-        }),
-      ]);
-
-      this.logger.log(`Contraseña de ${cuenta} actualizada`);
-    } catch (error) {
-      this.logger.error(`Error al cambiar contraseña de ${cuenta}`, error);
-      throw error;
-    } finally {
-      await client.unbind();
-    }
-  }
-}

src/active-directory/dto/create-active-directory.dto.ts

@@ -1 +0,0 @@
-export class CreateActiveDirectoryDto {}

src/active-directory/dto/update-active-directory.dto.ts

@@ -1,4 +0,0 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateActiveDirectoryDto } from './create-active-directory.dto';
-
-export class UpdateActiveDirectoryDto extends PartialType(CreateActiveDirectoryDto) {}

src/active-directory/entities/active-directory.entity.ts

@@ -1 +0,0 @@
-export class ActiveDirectory {}

src/alumno_inscrito/alumno_inscrito.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, Post, Body, Param, Patch, UseGuards } from '@nestjs/common';
+import { Controller, Get, Post, Body, Param, Patch, UseGuards, ParseIntPipe } from '@nestjs/common';
 import { AlumnoInscritoService } from './alumno_inscrito.service';
 import {
   CreateAlumnoInscritoDto,
@@ -58,4 +58,27 @@ export class AlumnoInscritoController {
   ): Promise<AlumnoInscrito[]> {
     return this.alumnoInscritoService.findById(id_cuenta);
   }
+
+@Get('inscritos/periodo/:inicio/:fin')
+  findByPeriodo(
+    @Param('inicio', ParseIntPipe) inicio: number,
+    @Param('fin', ParseIntPipe) fin: number,
+  ) {
+    return this.alumnoInscritoService.findAllInscritosByRango(inicio, fin, 'periodo');
+  }
+
+  @Get('inscritos/anio/:inicio/:fin')
+  findByAnio(
+    @Param('inicio', ParseIntPipe) inicio: number,
+    @Param('fin', ParseIntPipe) fin: number,
+  ) {
+    return this.alumnoInscritoService.findAllInscritosByRango(inicio, fin, 'anio');
+  }
+
+  @Get('inscritos/mes/:anio')
+  findByMes(
+    @Param('anio', ParseIntPipe) anio: number,
+  ) {
+    return this.alumnoInscritoService.findAllInscritosByRango(anio, 0, 'mes');
+  }
 }

src/alumno_inscrito/alumno_inscrito.service.ts

@@ -71,6 +71,7 @@ async findAllInscritos(idPeriodo: number) {
     .where('periodo.id_periodo = :idPeriodo', { idPeriodo })
     .select([
       'carrera.carrera AS carrera',
+      'periodo.semestre AS semestre',
       'plataforma.nombre AS profesor',
       'COUNT(DISTINCT CASE WHEN alumno.genero IN (\'F\', \'Femenino\') THEN alumno.id_cuenta END) AS femenino',
       'COUNT(DISTINCT CASE WHEN alumno.genero IN (\'M\', \'Masculino\') THEN alumno.id_cuenta END) AS masculino',
@@ -193,7 +194,7 @@ async findAllInscritos(idPeriodo: number) {
     }
   }
 
-  //Borrar
+  
   async addTimeBorrar(
     idCuenta: number,
     idPlataforma: number,
@@ -230,4 +231,119 @@ async findAllInscritos(idPeriodo: number) {
     const create = repo.create(data);
     return await repo.save(create);
   }
+async findAllInscritosByRango(
+  inicio: number,
+  fin: number,
+  tipo: 'periodo' | 'mes' | 'anio',
+) {
+  const qb = this.alumnoInscritoRepo
+    .createQueryBuilder('inscritos')
+    .innerJoin('inscritos.alumno', 'alumno')
+    .innerJoin('alumno.carrera', 'carrera')
+    .innerJoin('inscritos.plataforma', 'plataforma')
+    .innerJoin('inscritos.periodo', 'periodo');
+
+  // ============================
+  // 🟢 PERIODO
+  // ============================
+  if (tipo === 'periodo') {
+    qb.where('periodo.id_periodo BETWEEN :inicio AND :fin', {
+      inicio,
+      fin,
+    });
+
+    qb.select([
+      'periodo.id_periodo AS id_periodo',
+      'periodo.semestre AS semestre',
+      'carrera.carrera AS carrera',
+      'plataforma.nombre AS profesor',
+
+      `COUNT(DISTINCT CASE 
+        WHEN alumno.genero IN ('F', 'Femenino') 
+        THEN alumno.id_cuenta 
+      END) AS femenino`,
+
+      `COUNT(DISTINCT CASE 
+        WHEN alumno.genero IN ('M', 'Masculino') 
+        THEN alumno.id_cuenta 
+      END) AS masculino`,
+
+      'COUNT(DISTINCT alumno.id_cuenta) AS total',
+    ]);
+
+    qb.groupBy('periodo.id_periodo')
+      .addGroupBy('carrera.carrera')
+      .addGroupBy('plataforma.nombre')
+      .orderBy('periodo.id_periodo', 'ASC');
+  }
+
+  // ============================
+  // 🔵 AÑO
+  // ============================
+  else if (tipo === 'anio') {
+    qb.where(
+      'periodo.fecha_inicio_servicio BETWEEN :inicio AND :fin',
+      {
+        inicio: `${inicio}-01-01`,
+        fin: `${fin}-12-31`,
+      },
+    );
+
+    qb.select([
+      'YEAR(periodo.fecha_inicio_servicio) AS semestre',
+      'carrera.carrera AS carrera',
+      'plataforma.nombre AS profesor',
+
+      `COUNT(DISTINCT CASE 
+        WHEN alumno.genero IN ('F', 'Femenino') 
+        THEN alumno.id_cuenta 
+      END) AS femenino`,
+
+      `COUNT(DISTINCT CASE 
+        WHEN alumno.genero IN ('M', 'Masculino') 
+        THEN alumno.id_cuenta 
+      END) AS masculino`,
+
+      'COUNT(DISTINCT alumno.id_cuenta) AS total',
+    ]);
+
+    qb.groupBy('YEAR(periodo.fecha_inicio_servicio)')
+      .addGroupBy('carrera.carrera')
+      .addGroupBy('plataforma.nombre')
+     .orderBy('YEAR(periodo.fecha_inicio_servicio)', 'ASC')
+  }
+
+  // ============================
+  // 🟡 MES (UN SOLO AÑO)
+  // ============================
+  else if (tipo === 'mes') {
+    qb.where('YEAR(periodo.fecha_inicio_servicio) = :anio', {
+      anio: inicio, // aquí "inicio" es el año
+    });
+
+qb.select([
+  'MONTH(periodo.fecha_inicio_servicio) AS semestre',
+  'carrera.carrera AS carrera',
+  'plataforma.nombre AS profesor',
+
+  `COUNT(DISTINCT CASE 
+    WHEN alumno.genero IN ('F', 'Femenino') 
+    THEN alumno.id_cuenta 
+  END) AS femenino`,
+
+  `COUNT(DISTINCT CASE 
+    WHEN alumno.genero IN ('M', 'Masculino') 
+    THEN alumno.id_cuenta 
+  END) AS masculino`,
+
+  'COUNT(DISTINCT alumno.id_cuenta) AS total',
+]);
+    qb.groupBy('MONTH(periodo.fecha_inicio_servicio)')
+      .addGroupBy('carrera.carrera')
+      .addGroupBy('plataforma.nombre')
+      .orderBy('YEAR(periodo.fecha_inicio_servicio)', 'ASC')
+  }
+
+  return qb.getRawMany();
+}
 }

src/app.module.ts

@@ -43,7 +43,6 @@ import { BitacoraModule } from './bitacora/bitacora.module';
 import { Bitacora } from './bitacora/entities/bitacora.entity';
 import { MensajeModule } from './mensaje/mensaje.module';
 import { Mensaje } from './mensaje/entities/mensaje.entity';
-import { ActiveDirectoryModule } from './active-directory/active-directory.module';
 import { CostoModule } from './costo/costo.module';
 import { Costo } from './costo/entities/costo.entity';
 
@@ -108,7 +107,6 @@ import { Costo } from './costo/entities/costo.entity';
     BitacoraModule,
     MensajeModule,
     CostoModule,
-    ActiveDirectoryModule,
   ],
   controllers: [AppController],
   providers: [AppService],

src/detalle_servicio/detalle_servicio.controller.ts

@@ -25,17 +25,16 @@ export class DetalleServicioController {
     return this.detalleServicioService.findByDateRange(data.desde, data.hasta);
   }
 
-  @UseGuards(JwtAuthGuard, RolesGuard)
+
-  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
+@Get('totales-por-periodo')
-  @Get('totales-por-periodo')
+async getTotalesPorPeriodo(
-  async getTotalesPorPeriodo(
+  @Query('periodoInicio') periodoInicio?: string,
-    @Query('periodoInicio') periodoInicio?: string,
+  @Query('periodoFin') periodoFin?: string,
-    @Query('periodoFin') periodoFin?: string,
+  @Query('servicioId') servicioId?: string,
-    @Query('servicioId') servicioId?: string,
+) {
-  ) {
+  const inicio = periodoInicio ? parseInt(periodoInicio) : undefined;
-    const inicio = periodoInicio ? parseInt(periodoInicio) : undefined;
+  const fin = periodoFin ? parseInt(periodoFin) : undefined;
-    const fin = periodoFin ? parseInt(periodoFin) : undefined;
+  const servicio = servicioId ? parseInt(servicioId) : undefined;
-    const servicio = servicioId ? parseInt(servicioId) : undefined;
+  return this.detalleServicioService.getTotalesPorServicioYPeriodo(inicio, fin, servicio);
-    return this.detalleServicioService.getTotalesPorServicioYPeriodo(inicio, fin, servicio);
+}
-  }
 }

src/mesa/mesa.controller.ts

@@ -11,33 +11,26 @@ export class MesaController {
   constructor(private readonly mesaService: MesaService) { }
 
   @UseGuards(JwtAuthGuard, RolesGuard)
-  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR, Role.ATENCION_USUARIOS, Role.SERVICIO_SOCIAL)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
   @Get()
   async findAll() {
     return this.mesaService.findAll();
   }
 
   @UseGuards(JwtAuthGuard, RolesGuard)
-  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR, Role.ATENCION_USUARIOS, Role.SERVICIO_SOCIAL)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
   @Get('activo')
   async findAllActivo() {
     return this.mesaService.findAllActivo();
   }
   
   @UseGuards(JwtAuthGuard, RolesGuard)
-  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR, Role.ATENCION_USUARIOS, Role.SERVICIO_SOCIAL)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
   @Get('uso')
   async findActiveMesas() {
     return this.mesaService.findActiveMesas();
   }
 
-  @UseGuards(JwtAuthGuard, RolesGuard)
-  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR, Role.ATENCION_USUARIOS, Role.SERVICIO_SOCIAL)
-  @Get('usoWhitout')
-  async findActiveMesasWhitoudOcupado() {
-    return this.mesaService.findActiveMesasWhitoudOcupado();
-  }
-
   @UseGuards(JwtAuthGuard, RolesGuard)
   @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
   @Patch(':id')
@@ -49,7 +42,7 @@ export class MesaController {
   }
 
   @UseGuards(JwtAuthGuard, RolesGuard)
-  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR, Role.ATENCION_USUARIOS, Role.SERVICIO_SOCIAL)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
   @Patch(':id/activo')
   toggleActivo(@Param('id') id: number) {
     return this.mesaService.toggleActivo(+id);

src/mesa/mesa.service.ts

@@ -142,27 +142,4 @@ export class MesaService {
       .orderBy('mesa.id_mesa', 'ASC')
       .getRawMany();
   }
-
-  findActiveMesasWhitoudOcupado() {
-    return this.mesaRepository
-      .createQueryBuilder('mesa')
-      .select([
-        'mesa.id_mesa AS id_mesa',
-      ])
-      .where('mesa.activo = 1')
-      .andWhere(`
-      NOT EXISTS (
-        SELECT 1
-        FROM bitacora_mesa bm
-        WHERE bm.id_mesa = mesa.id_mesa
-          AND TIMESTAMPDIFF(
-            SECOND,
-            NOW(),
-            DATE_ADD(bm.tiempo_entrada, INTERVAL bm.tiempo_asignado MINUTE)
-          ) > 0
-      )
-    `)
-      .orderBy('mesa.id_mesa', 'ASC')
-      .getRawMany();
-  }
 }

src/periodo/periodo.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Delete, Get, Param, Patch, Post, Put, UseGuards } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Patch, Post, Put, Query, UseGuards } from '@nestjs/common';
 import { PeriodoService } from './periodo.service';
 import { CreatePeriodoDto, ModifiedDateDto } from './dto/create-periodo.dto';
 import { JwtAuthGuard } from 'src/user/jwt.guard';
@@ -37,4 +37,23 @@ export class PeriodoController {
     modifiedDate(@Body() data: ModifiedDateDto, @Param("id_periodo") id_periodo: number) {
         return this.periodoService.modifiedDate(data, id_periodo)
     }
+
+    @UseGuards(JwtAuthGuard, RolesGuard)
+@Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
+@Get('compare')
+compare(
+  @Query('p1') p1: number,
+  @Query('p2') p2: number,
+) {
+  return this.periodoService.comparePeriodos(p1, p2);
+}
+
+@Get('range')
+getRange(
+  @Query('p1') p1: number,
+  @Query('p2') p2: number,
+) {
+  return this.periodoService.getPeriodosEnRango(p1, p2);
+}
+    
 }

src/periodo/periodo.service.ts

@@ -1,7 +1,7 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Periodo } from './entities/periodo.entity';
-import { Repository } from 'typeorm';
+import { Between, Repository } from 'typeorm';
 import { CreatePeriodoDto, ModifiedDateDto } from './dto/create-periodo.dto';
 
 @Injectable()
@@ -69,4 +69,50 @@ export class PeriodoService {
   async modifiedDate(data: ModifiedDateDto, id_periodo) {
     return this.periodoRepository.update(id_periodo, data)
   }
+
+  async comparePeriodos(id1: number, id2: number) {
+  const periodo1 = await this.periodoRepository.findOne({
+    where: { id_periodo: id1 },
+  });
+
+  const periodo2 = await this.periodoRepository.findOne({
+    where: { id_periodo: id2 },
+  });
+
+  if (!periodo1 || !periodo2) {
+    throw new NotFoundException('Uno de los periodos no existe');
+  }
+
+  return {
+    periodo1: {
+      id: periodo1.id_periodo,
+      nombre: periodo1.semestre,
+      fecha_inicio: periodo1.fecha_inicio_servicio,
+      fecha_fin: periodo1.fecha_fin_servicio,
+    },
+    periodo2: {
+      id: periodo2.id_periodo,
+      nombre: periodo2.semestre,
+      fecha_inicio: periodo2.fecha_inicio_servicio,
+      fecha_fin: periodo2.fecha_fin_servicio,
+    },
+  };
 }
+
+async getPeriodosEnRango(id1: number, id2: number) {
+  const min = Math.min(id1, id2);
+  const max = Math.max(id1, id2);
+
+  return this.periodoRepository.find({
+    where: {
+      id_periodo: Between(min, max),
+    },
+    order: {
+      id_periodo: 'ASC',
+    },
+  });
+}
+  
+}
+
+

src/user/user.controller.ts

@@ -19,7 +19,8 @@ import { Role } from 'src/role.enum';
 export class UserController {
   constructor(private readonly userService: UserService) { }
 
-
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
   @Get()
   async getAll() {
     return this.userService.getAll();

src/user/user.service.ts

@@ -28,10 +28,6 @@ export class UserService {
       where: { usuario, password },
     });
 
-    if(user?.activo === 0){
-      throw new NotFoundException(`El usuario se encuentra desactivado`);
-    }
-
     if (!user) {
       throw new NotFoundException(`El usuario o la contraseña es incorrecta`);
     }