@Patch idactivo

merge
merge axel
2026-03-05 14:41:19 -05:00 · 2026-03-04 14:20:47 -05:00 · 2026-03-03 17:41:06 -06:00 · 2026-03-03 17:37:43 -06:00 · 2026-03-03 17:37:36 -06:00 · 2026-03-03 17:25:25 -06:00
28 changed files with 600 additions and 323 deletions
@@ -876,20 +876,20 @@
      }
    },
    "node_modules/@eslint/eslintrc": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz",
-      "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.4.tgz",
+      "integrity": "sha512-4h4MVF8pmBsncB60r0wSJiIeUKTSD4m7FmTFThG8RHlsg9ajqckLm9OraguFGZE4vVdpiI1Q4+hFnisopmG6gQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "ajv": "^6.12.4",
+        "ajv": "^6.14.0",
        "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.2",
+        "minimatch": "^3.1.3",
        "strip-json-comments": "^3.1.1"
      },
      "engines": {
@@ -913,9 +913,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.39.2",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz",
-      "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==",
+      "version": "9.39.3",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.3.tgz",
+      "integrity": "sha512-1B1VkCq6FuUNlQvlBYb+1jDu/gV297TIs/OeiaSR9l1H27SVW55ONE1e1Vp16NqP683+xEGzxYtv4XCiDPaQiw==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1416,12 +1416,12 @@
      }
    },
    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
      "license": "MIT",
      "dependencies": {
-        "ansi-regex": "^6.0.1"
+        "ansi-regex": "^6.2.2"
      },
      "engines": {
        "node": ">=12"
@@ -1824,13 +1824,13 @@
      "license": "ISC"
    },
    "node_modules/@jest/reporters/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
      "dev": true,
      "license": "ISC",
      "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^2.0.2"
      },
      "engines": {
        "node": ">=16 || 14 >=14.17"
@@ -2408,14 +2408,14 @@
      }
    },
    "node_modules/@nestjs/platform-express": {
-      "version": "11.1.14",
-      "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-11.1.14.tgz",
-      "integrity": "sha512-Fs+/j+mBSBSXErOQJ/YdUn/HqJGSJ4pGfiJyYOyz04l42uNVnqEakvu1kXLbxMabR6vd6/h9d6Bi4tso9p7o4Q==",
+      "version": "11.1.15",
+      "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-11.1.15.tgz",
+      "integrity": "sha512-sR42dQ5fPy4NGbnhT4mRIJLL0h2eNY4KpLkcfd27vg5XdTjQQ07wkQORrw6rAkWkBvMRr0dmhAcUBnXpe7ro5Q==",
      "license": "MIT",
      "dependencies": {
        "cors": "2.8.6",
        "express": "5.2.1",
-        "multer": "2.0.2",
+        "multer": "2.1.0",
        "path-to-regexp": "8.3.0",
        "tslib": "2.8.1"
      },
@@ -2927,9 +2927,9 @@
      "license": "MIT"
    },
    "node_modules/@types/node": {
-      "version": "22.19.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.11.tgz",
-      "integrity": "sha512-BH7YwL6rA93ReqeQS1c4bsPpcfOmJasG+Fkr6Y59q83f9M1WcBRHR2vM+P9eOisYRcN3ujQoiZY8uk5W+1WL8w==",
+      "version": "22.19.13",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.13.tgz",
+      "integrity": "sha512-akNQMv0wW5uyRpD2v2IEyRSZiR+BeGuoB6L310EgGObO44HSMNT8z1xzio28V8qOrgYaopIDNA18YgdXd+qTiw==",
      "license": "MIT",
      "dependencies": {
        "undici-types": "~6.21.0"
@@ -3057,17 +3057,17 @@
      "license": "MIT"
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.0.tgz",
-      "integrity": "sha512-lRyPDLzNCuae71A3t9NEINBiTn7swyOhvUj3MyUOxb8x6g6vPEFoOU+ZRmGMusNC3X3YMhqMIX7i8ShqhT74Pw==",
+      "version": "8.56.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz",
+      "integrity": "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.56.0",
-        "@typescript-eslint/type-utils": "8.56.0",
-        "@typescript-eslint/utils": "8.56.0",
-        "@typescript-eslint/visitor-keys": "8.56.0",
+        "@typescript-eslint/scope-manager": "8.56.1",
+        "@typescript-eslint/type-utils": "8.56.1",
+        "@typescript-eslint/utils": "8.56.1",
+        "@typescript-eslint/visitor-keys": "8.56.1",
        "ignore": "^7.0.5",
        "natural-compare": "^1.4.0",
        "ts-api-utils": "^2.4.0"
@@ -3080,7 +3080,7 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.56.0",
+        "@typescript-eslint/parser": "^8.56.1",
        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
        "typescript": ">=4.8.4 <6.0.0"
      }
@@ -3096,16 +3096,16 @@
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.0.tgz",
-      "integrity": "sha512-IgSWvLobTDOjnaxAfDTIHaECbkNlAlKv2j5SjpB2v7QHKv1FIfjwMy8FsDbVfDX/KjmCmYICcw7uGaXLhtsLNg==",
+      "version": "8.56.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.1.tgz",
+      "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.56.0",
-        "@typescript-eslint/types": "8.56.0",
-        "@typescript-eslint/typescript-estree": "8.56.0",
-        "@typescript-eslint/visitor-keys": "8.56.0",
+        "@typescript-eslint/scope-manager": "8.56.1",
+        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/typescript-estree": "8.56.1",
+        "@typescript-eslint/visitor-keys": "8.56.1",
        "debug": "^4.4.3"
      },
      "engines": {
@@ -3121,14 +3121,14 @@
      }
    },
    "node_modules/@typescript-eslint/project-service": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.0.tgz",
-      "integrity": "sha512-M3rnyL1vIQOMeWxTWIW096/TtVP+8W3p/XnaFflhmcFp+U4zlxUxWj4XwNs6HbDeTtN4yun0GNTTDBw/SvufKg==",
+      "version": "8.56.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.1.tgz",
+      "integrity": "sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.56.0",
-        "@typescript-eslint/types": "^8.56.0",
+        "@typescript-eslint/tsconfig-utils": "^8.56.1",
+        "@typescript-eslint/types": "^8.56.1",
        "debug": "^4.4.3"
      },
      "engines": {
@@ -3143,14 +3143,14 @@
      }
    },
    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.0.tgz",
-      "integrity": "sha512-7UiO/XwMHquH+ZzfVCfUNkIXlp/yQjjnlYUyYz7pfvlK3/EyyN6BK+emDmGNyQLBtLGaYrTAI6KOw8tFucWL2w==",
+      "version": "8.56.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.1.tgz",
+      "integrity": "sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.56.0",
-        "@typescript-eslint/visitor-keys": "8.56.0"
+        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/visitor-keys": "8.56.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3161,9 +3161,9 @@
      }
    },
    "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.0.tgz",
-      "integrity": "sha512-bSJoIIt4o3lKXD3xmDh9chZcjCz5Lk8xS7Rxn+6l5/pKrDpkCwtQNQQwZ2qRPk7TkUYhrq3WPIHXOXlbXP0itg==",
+      "version": "8.56.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz",
+      "integrity": "sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3178,15 +3178,15 @@
      }
    },
    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.0.tgz",
-      "integrity": "sha512-qX2L3HWOU2nuDs6GzglBeuFXviDODreS58tLY/BALPC7iu3Fa+J7EOTwnX9PdNBxUI7Uh0ntP0YWGnxCkXzmfA==",
+      "version": "8.56.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.1.tgz",
+      "integrity": "sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.56.0",
-        "@typescript-eslint/typescript-estree": "8.56.0",
-        "@typescript-eslint/utils": "8.56.0",
+        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/typescript-estree": "8.56.1",
+        "@typescript-eslint/utils": "8.56.1",
        "debug": "^4.4.3",
        "ts-api-utils": "^2.4.0"
      },
@@ -3203,9 +3203,9 @@
      }
    },
    "node_modules/@typescript-eslint/types": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.0.tgz",
-      "integrity": "sha512-DBsLPs3GsWhX5HylbP9HNG15U0bnwut55Lx12bHB9MpXxQ+R5GC8MwQe+N1UFXxAeQDvEsEDY6ZYwX03K7Z6HQ==",
+      "version": "8.56.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.1.tgz",
+      "integrity": "sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3217,18 +3217,18 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.0.tgz",
-      "integrity": "sha512-ex1nTUMWrseMltXUHmR2GAQ4d+WjkZCT4f+4bVsps8QEdh0vlBsaCokKTPlnqBFqqGaxilDNJG7b8dolW2m43Q==",
+      "version": "8.56.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.1.tgz",
+      "integrity": "sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/project-service": "8.56.0",
-        "@typescript-eslint/tsconfig-utils": "8.56.0",
-        "@typescript-eslint/types": "8.56.0",
-        "@typescript-eslint/visitor-keys": "8.56.0",
+        "@typescript-eslint/project-service": "8.56.1",
+        "@typescript-eslint/tsconfig-utils": "8.56.1",
+        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/visitor-keys": "8.56.1",
        "debug": "^4.4.3",
-        "minimatch": "^9.0.5",
+        "minimatch": "^10.2.2",
        "semver": "^7.7.3",
        "tinyglobby": "^0.2.15",
        "ts-api-utils": "^2.4.0"
@@ -3244,43 +3244,56 @@
        "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": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
+      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
      }
    },
    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
      "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
      "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^5.0.2"
      },
      "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
      },
      "funding": {
        "url": "https://github.com/sponsors/isaacs"
      }
    },
    "node_modules/@typescript-eslint/utils": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.0.tgz",
-      "integrity": "sha512-RZ3Qsmi2nFGsS+n+kjLAYDPVlrzf7UhTffrDIKr+h2yzAlYP/y5ZulU0yeDEPItos2Ph46JAL5P/On3pe7kDIQ==",
+      "version": "8.56.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.1.tgz",
+      "integrity": "sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.56.0",
-        "@typescript-eslint/types": "8.56.0",
-        "@typescript-eslint/typescript-estree": "8.56.0"
+        "@typescript-eslint/scope-manager": "8.56.1",
+        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/typescript-estree": "8.56.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3295,13 +3308,13 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.0.tgz",
-      "integrity": "sha512-q+SL+b+05Ud6LbEE35qe4A99P+htKTKVbyiNEe45eCbJFyh/HVK9QXwlrbz+Q4L8SOW4roxSVwXYj4DMBT7Ieg==",
+      "version": "8.56.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz",
+      "integrity": "sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.56.0",
+        "@typescript-eslint/types": "8.56.1",
        "eslint-visitor-keys": "^5.0.0"
      },
      "engines": {
@@ -3313,9 +3326,9 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.0.tgz",
-      "integrity": "sha512-A0XeIi7CXU7nPlfHS9loMYEKxUaONu/hTEzHTGba9Huu94Cq1hPivf+DE5erJozZOky0LfvXAyrV/tcswpLI0Q==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -3790,9 +3803,9 @@
      }
    },
    "node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
      "devOptional": true,
      "license": "MIT",
      "bin": {
@@ -3826,9 +3839,9 @@
      }
    },
    "node_modules/acorn-walk": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+      "version": "8.3.5",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz",
+      "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==",
      "devOptional": true,
      "license": "MIT",
      "dependencies": {
@@ -3839,9 +3852,9 @@
      }
    },
    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -4193,13 +4206,16 @@
      "license": "MIT"
    },
    "node_modules/baseline-browser-mapping": {
-      "version": "2.9.19",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz",
-      "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz",
+      "integrity": "sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==",
      "dev": true,
      "license": "Apache-2.0",
      "bin": {
-        "baseline-browser-mapping": "dist/cli.js"
+        "baseline-browser-mapping": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": ">=6.0.0"
      }
    },
    "node_modules/bl": {
@@ -4444,9 +4460,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001770",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001770.tgz",
-      "integrity": "sha512-x/2CLQ1jHENRbHg5PSId2sXq1CIO1CISvwWAj027ltMVG2UNgW+w9oH2+HzgEIRFembL8bUlXtfbBHR1fCg2xw==",
+      "version": "1.0.30001775",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001775.tgz",
+      "integrity": "sha512-s3Qv7Lht9zbVKE9XoTyRG6wVDCKdtOFIjBGg3+Yhn6JaytuNKPIjBMTMIY1AnOH3seL5mvF+x33oGAyK3hVt3A==",
      "dev": true,
      "funding": [
        {
@@ -4554,14 +4570,14 @@
      "license": "MIT"
    },
    "node_modules/class-validator": {
-      "version": "0.14.3",
-      "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.3.tgz",
-      "integrity": "sha512-rXXekcjofVN1LTOSw+u4u9WXVEUvNBVjORW154q/IdmYWy1nMbOU9aNtZB0t8m+FJQ9q91jlr2f9CwwUFdFMRA==",
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.4.tgz",
+      "integrity": "sha512-AwNusCCam51q703dW82x95tOqQp6oC9HNUl724KxJJOfnKscI8dOloXFgyez7LbTTKWuRBA37FScqVbJEoq8Yw==",
      "license": "MIT",
      "dependencies": {
        "@types/validator": "^13.15.3",
        "libphonenumber-js": "^1.11.1",
-        "validator": "^13.15.20"
+        "validator": "^13.15.22"
      }
    },
    "node_modules/cli-cursor": {
@@ -4922,9 +4938,9 @@
      }
    },
    "node_modules/dedent": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.1.tgz",
-      "integrity": "sha512-9JmrhGZpOlEgOLdQgSm0zxFaYoQon408V1v49aqTWuXENVlnCuY9JBZcXZiCsZQWDjTm5Qf/nIvAy77mXDAjEg==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz",
+      "integrity": "sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==",
      "license": "MIT",
      "peerDependencies": {
        "babel-plugin-macros": "^3.1.0"
@@ -5116,9 +5132,9 @@
      "license": "MIT"
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.5.286",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz",
-      "integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A==",
+      "version": "1.5.302",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.302.tgz",
+      "integrity": "sha512-sM6HAN2LyK82IyPBpznDRqlTQAtuSaO+ShzFiWTvoMJLHyZ+Y39r8VMfHzwbU8MVBzQ4Wdn85+wlZl2TLGIlwg==",
      "dev": true,
      "license": "ISC"
    },
@@ -5151,9 +5167,9 @@
      }
    },
    "node_modules/enhanced-resolve": {
-      "version": "5.19.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.19.0.tgz",
-      "integrity": "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==",
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.0.tgz",
+      "integrity": "sha512-/ce7+jQ1PQ6rVXwe+jKEg5hW5ciicHwIQUagZkp6IufBoY3YDgdTTY1azVs0qoRgVmvsNB+rbjLJxDAeHHtwsQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -5256,9 +5272,9 @@
      }
    },
    "node_modules/eslint": {
-      "version": "9.39.2",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz",
-      "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
+      "version": "9.39.3",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.3.tgz",
+      "integrity": "sha512-VmQ+sifHUbI/IcSopBCF/HO3YiHQx/AVd3UVyYL6weuwW+HvON9VYn5l6Zl1WZzPWXPNZrSQpxwkkZ/VuvJZzg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -5268,7 +5284,7 @@
        "@eslint/config-helpers": "^0.4.2",
        "@eslint/core": "^0.17.0",
        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.39.2",
+        "@eslint/js": "9.39.3",
        "@eslint/plugin-kit": "^0.4.1",
        "@humanfs/node": "^0.16.6",
        "@humanwhocodes/module-importer": "^1.0.1",
@@ -5767,9 +5783,9 @@
      }
    },
    "node_modules/flatted": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.4.tgz",
+      "integrity": "sha512-3+mMldrTAPdta5kjX2G2J7iX4zxtnwpdA8Tr2ZSjkyPSanvbZAcy6flmtnXbEybHrDcU9641lxrMfFuUxVz9vA==",
      "dev": true,
      "license": "ISC"
    },
@@ -6088,39 +6104,39 @@
      "license": "BSD-2-Clause"
    },
    "node_modules/glob/node_modules/balanced-match": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.3.tgz",
-      "integrity": "sha512-1pHv8LX9CpKut1Zp4EXey7Z8OfH11ONNH6Dhi2WDUt31VVZFXZzKwXcysBgqSumFCmR+0dqjMK5v5JiFHzi0+g==",
+      "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": "20 || >=22"
+        "node": "18 || 20 || >=22"
      }
    },
    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.2.tgz",
-      "integrity": "sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
+      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "balanced-match": "^4.0.2"
      },
      "engines": {
-        "node": "20 || >=22"
+        "node": "18 || 20 || >=22"
      }
    },
    "node_modules/glob/node_modules/minimatch": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.1.tgz",
-      "integrity": "sha512-MClCe8IL5nRRmawL6ib/eT4oLyeKMGCghibcDWK+J0hh0Q8kqSdia6BvbRMVk6mPa6WqUa5uR2oxt6C5jd533A==",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
      "dev": true,
      "license": "BlueOak-1.0.0",
      "dependencies": {
        "brace-expansion": "^5.0.2"
      },
      "engines": {
-        "node": "20 || >=22"
+        "node": "18 || 20 || >=22"
      },
      "funding": {
        "url": "https://github.com/sponsors/isaacs"
@@ -6848,13 +6864,13 @@
      "license": "ISC"
    },
    "node_modules/jest-config/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
      "dev": true,
      "license": "ISC",
      "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^2.0.2"
      },
      "engines": {
        "node": ">=16 || 14 >=14.17"
@@ -7227,13 +7243,13 @@
      "license": "ISC"
    },
    "node_modules/jest-runtime/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
      "dev": true,
      "license": "ISC",
      "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^2.0.2"
      },
      "engines": {
        "node": ">=16 || 14 >=14.17"
@@ -7566,9 +7582,9 @@
      }
    },
    "node_modules/libphonenumber-js": {
-      "version": "1.12.37",
-      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.37.tgz",
-      "integrity": "sha512-rDU6bkpuMs8YRt/UpkuYEAsYSoNuDEbrE41I3KNvmXREGH6DGBJ8Wbak4by29wNOQ27zk4g4HL82zf0OGhwRuw==",
+      "version": "1.12.38",
+      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.38.tgz",
+      "integrity": "sha512-vwzxmasAy9hZigxtqTbFEwp8ZdZ975TiqVDwj5bKx5sR+zi5ucUQy9mbVTkKM9GzqdLdxux/hTw2nmN5J7POMA==",
      "license": "MIT"
    },
    "node_modules/lines-and-columns": {
@@ -7916,9 +7932,9 @@
      }
    },
    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
      "dev": true,
      "license": "ISC",
      "dependencies": {
@@ -7932,6 +7948,7 @@
      "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"
@@ -7946,18 +7963,6 @@
        "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",
@@ -7965,21 +7970,22 @@
      "license": "MIT"
    },
    "node_modules/multer": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz",
-      "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.1.0.tgz",
+      "integrity": "sha512-TBm6j41rxNohqawsxlsWsNNh/VdV4QFXcBvRcPhXaA05EZ79z0qJ2bQFpync6JBoHTeNY5Q1JpG7AlTjdlfAEA==",
      "license": "MIT",
      "dependencies": {
        "append-field": "^1.0.0",
        "busboy": "^1.6.0",
        "concat-stream": "^2.0.0",
-        "mkdirp": "^0.5.6",
-        "object-assign": "^4.1.1",
-        "type-is": "^1.6.18",
-        "xtend": "^4.0.2"
+        "type-is": "^1.6.18"
      },
      "engines": {
        "node": ">= 10.16.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/multer/node_modules/media-typer": {
@@ -8036,9 +8042,9 @@
      }
    },
    "node_modules/mysql2": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.17.2.tgz",
-      "integrity": "sha512-/tFCtdqk5V5Aowpnzshryxuxp63ti4I7kcp3yqAKgWmhYXEXs8+F/IbQ6JTMzQPYc+ElnnhmMD2SqUYLtRVcTQ==",
+      "version": "3.18.2",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.18.2.tgz",
+      "integrity": "sha512-UfEShBFAZZEAKjySnTUuE7BgqkYT4mx+RjoJ5aqtmwSSvNcJ/QxQPXz/y3jSxNiVRedPfgccmuBtiPCSiEEytw==",
      "license": "MIT",
      "dependencies": {
        "aws-ssl-profiles": "^1.1.2",
@@ -8046,13 +8052,15 @@
        "generate-function": "^2.3.1",
        "iconv-lite": "^0.7.2",
        "long": "^5.3.2",
-        "lru.min": "^1.1.3",
+        "lru.min": "^1.1.4",
        "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": {
@@ -8415,9 +8423,9 @@
      }
    },
    "node_modules/path-scurry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
-      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
      "dev": true,
      "license": "BlueOak-1.0.0",
      "dependencies": {
@@ -8425,7 +8433,7 @@
        "minipass": "^7.1.2"
      },
      "engines": {
-        "node": "20 || >=22"
+        "node": "18 || 20 || >=22"
      },
      "funding": {
        "url": "https://github.com/sponsors/isaacs"
@@ -8706,16 +8714,6 @@
        "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",
@@ -8962,21 +8960,6 @@
        "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",
@@ -9498,16 +9481,15 @@
      }
    },
    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.16",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz",
-      "integrity": "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==",
+      "version": "5.3.17",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.17.tgz",
+      "integrity": "sha512-YR7PtUp6GMU91BgSJmlaX/rS2lGDbAF7D+Wtq7hRO+MiljNmodYvqslzCFiYVAgW+Qoaaia/QUIP4lGXufjdZw==",
      "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": {
@@ -10209,12 +10191,12 @@
      "license": "ISC"
    },
    "node_modules/typeorm/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
      "license": "ISC",
      "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^2.0.2"
      },
      "engines": {
        "node": ">=16 || 14 >=14.17"
@@ -10254,16 +10236,16 @@
      }
    },
    "node_modules/typescript-eslint": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.0.tgz",
-      "integrity": "sha512-c7toRLrotJ9oixgdW7liukZpsnq5CZ7PuKztubGYlNppuTqhIoWfhgHo/7EU0v06gS2l/x0i2NEFK1qMIf0rIg==",
+      "version": "8.56.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.1.tgz",
+      "integrity": "sha512-U4lM6pjmBX7J5wk4szltF7I1cGBHXZopnAXCMXb3+fZ3B/0Z3hq3wS/CCUB2NZBNAExK92mCU2tEohWuwVMsDQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.56.0",
-        "@typescript-eslint/parser": "8.56.0",
-        "@typescript-eslint/typescript-estree": "8.56.0",
-        "@typescript-eslint/utils": "8.56.0"
+        "@typescript-eslint/eslint-plugin": "8.56.1",
+        "@typescript-eslint/parser": "8.56.1",
+        "@typescript-eslint/typescript-estree": "8.56.1",
+        "@typescript-eslint/utils": "8.56.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -10519,9 +10501,9 @@
      }
    },
    "node_modules/webpack": {
-      "version": "5.105.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.2.tgz",
-      "integrity": "sha512-dRXm0a2qcHPUBEzVk8uph0xWSjV/xZxenQQbLwnwP7caQCYpqG1qddwlyEkIDkYn0K8tvmcrZ+bOrzoQ3HxCDw==",
+      "version": "5.105.3",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.3.tgz",
+      "integrity": "sha512-LLBBA4oLmT7sZdHiYE/PeVuifOxYyE2uL/V+9VQP7YSYdJU7bSf7H8bZRRxW8kEPMkmVjnrXmoR3oejIdX0xbg==",
      "dev": true,
      "license": "MIT",
      "peer": true,
@@ -10532,7 +10514,7 @@
        "@webassemblyjs/ast": "^1.14.1",
        "@webassemblyjs/wasm-edit": "^1.14.1",
        "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.15.0",
+        "acorn": "^8.16.0",
        "acorn-import-phases": "^1.0.3",
        "browserslist": "^4.28.1",
        "chrome-trace-event": "^1.0.2",
@@ -10550,7 +10532,7 @@
        "tapable": "^2.3.0",
        "terser-webpack-plugin": "^5.3.16",
        "watchpack": "^2.5.1",
-        "webpack-sources": "^3.3.3"
+        "webpack-sources": "^3.3.4"
      },
      "bin": {
        "webpack": "bin/webpack.js"
@@ -10825,15 +10807,6 @@
        "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",
@@ -2,33 +2,40 @@ import { Body, Controller, Post, Req, UseGuards } from '@nestjs/common';
 import { OperationsService } from './operations.services';
 import { chargePrintDto } from './dto/operations.dto';
 import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('operations')
 export class OperationsController {
-  constructor(private readonly operationsService: OperationsService) {}
+  constructor(private readonly operationsService: OperationsService) { }

-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR, Role.ATENCION_USUARIOS, Role.PCPUMA, Role.SERVICIO_SOCIAL)
  @Post('impressions')
  async chargePrint(@Body() data: chargePrintDto, @Req() req: any) {
    const id_usuario = req.user.id;
    return this.operationsService.chargePrint(data, id_usuario);
  }

-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR, Role.ATENCION_USUARIOS, Role.PCPUMA, Role.SERVICIO_SOCIAL)
  @Post('receipt')
  async addCredit(@Body() data, @Req() req: any) {
    const id_usuario = req.user.id;
    return this.operationsService.addCredit(data, id_usuario);
  }

-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR, Role.SERVICIO_SOCIAL, Role.ATENCION_USUARIOS)
  @Post('registration')
  async addReceiptInscription(@Body() data, @Req() req: any) {
    const id_usuario = req.user.id;
    return this.operationsService.addReceiptInscription(data, id_usuario);
  }

-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR, Role.SERVICIO_SOCIAL, Role.ATENCION_USUARIOS)
  @Post('time')
  async addTime(@Body() data, @Req() req: any) {
    const id_usuario = req.user.id;
@@ -11,28 +11,36 @@ import { Role } from 'src/role.enum';
 export class AlumnoController {
  constructor(private readonly alumnoService: AlumnoService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get()
  async find() {
    return this.alumnoService.findAll()
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post()
  async create(@Body() createStudentDto: CreateStudentDto): Promise<Alumno> {
    return this.alumnoService.create(createStudentDto);
  }

-  //@UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL,Role.PCPUMA)
  @Get(':id')
  findOneWhitSancion(@Param('id') id: number) {
    return this.alumnoService.findOneWhitSancion(+id);
  }

-  //@UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL,Role.PCPUMA)
  @Get('sancion/:id')
  findOne(@Param('id') id: number) {
    return this.alumnoService.findOne(+id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post('/create')
  async newStudent(@Body() createStudentDto: CreateStudentDto) {
    return this.alumnoService.create(createStudentDto);
@@ -1,44 +1,48 @@
-import { Controller, Get, Post, Body, Param, Patch } from '@nestjs/common';
+import { Controller, Get, Post, Body, Param, Patch, UseGuards } from '@nestjs/common';
 import { AlumnoInscritoService } from './alumno_inscrito.service';
 import {
  CreateAlumnoInscritoDto,
 } from './dto/create-alumno_inscrito.dto';
 import { AlumnoInscrito } from './entities/alumno_inscrito.entity';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('alumno-inscrito')
 export class AlumnoInscritoController {
  constructor(private readonly alumnoInscritoService: AlumnoInscritoService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Post()
  async create(@Body() dto: CreateAlumnoInscritoDto): Promise<AlumnoInscrito> {
    return this.alumnoInscritoService.createWhitoutPay(dto);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get()
  async findAll(): Promise<AlumnoInscrito[]> {
    return this.alumnoInscritoService.findAll();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get("/inscritos/:idPeriodo")
  async findAllInscritos(@Param('idPeriodo') idPeriodo: number) {
    return this.alumnoInscritoService.findAllInscritos(idPeriodo);
  }

-  // @Post('/tiempo')
-  // async addTime(@Body() body: AddTimeDto) {
-  //   const { idCuenta, idPlataforma, tiempoExtra } = body;
-  //   return this.alumnoInscritoService.(
-  //     idCuenta,
-  //     idPlataforma,
-  //     tiempoExtra,
-  //   );
-  // }
-
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get('/plataforma')
  async findAllPlataforma() {
    return this.alumnoInscritoService.findAllPlataforma();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Get(':id_cuenta')
  async findByIdWhitoud(
    @Param('id_cuenta') id_cuenta: number,
@@ -46,24 +50,12 @@ export class AlumnoInscritoController {
    return this.alumnoInscritoService.findByIdWhitoud(id_cuenta);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Get(':id_cuenta/sancion')
  async findById(
    @Param('id_cuenta') id_cuenta: number,
  ): Promise<AlumnoInscrito[]> {
    return this.alumnoInscritoService.findById(id_cuenta);
  }
-
-  //pruebas borrar
-  @Patch('platica/:idCuenta/:idPeriodo/:idPlataforma')
-  marcarPlatica(
-    @Param('idCuenta') idCuenta: number,
-    @Param('idPeriodo') idPeriodo: number,
-    @Param('idPlataforma') idPlataforma: number,
-  ) {
-    return this.alumnoInscritoService.marcarPlatica(
-      idCuenta,
-      idPeriodo,
-      idPlataforma,
-    );
-  }
 }
@@ -1,21 +1,31 @@
-import { Body, Controller, Delete, Get, Param, Post } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Post, UseGuards } from '@nestjs/common';
 import { AlumnoSancionService } from './alumno_sancion.service';
 import { CreateAlumnoSancionDto } from './dto/create-alumno_sancion.dto';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('alumno-sancion')
 export class AlumnoSancionController {
-  constructor(private readonly alumnoSancionService: AlumnoSancionService) {}
+  constructor(private readonly alumnoSancionService: AlumnoSancionService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post()
  async create(@Body() createAlumnoSancionDto: CreateAlumnoSancionDto) {
    return this.alumnoSancionService.create(createAlumnoSancionDto);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get(':id')
  findbyStudent(@Param('id') id: number) {
    return this.alumnoSancionService.findbyStudent(+id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Delete(':id_cuenta')
  async deleteSancionesAlumno(@Param('id_cuenta') id_cuenta: number) {
    return this.alumnoSancionService.removeByStudent(+id_cuenta);
@@ -56,9 +56,6 @@ export class AlumnoSancionService {
      where: { alumno: { id_cuenta } },
    });

-    if (alusancion.length === 0) {
-      throw new NotFoundException(`El estudiante no cuenta con una sanción activa`);
-    }
    return { student, alusancion };
  }

@@ -1,22 +1,32 @@
-import { Controller, Get, Param } from '@nestjs/common';
+import { Controller, Get, Param, UseGuards } from '@nestjs/common';
 import { AreaUbicacionService } from './area_ubicacion.service';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('area-ubicacion')
 export class AreaUbicacionController {
-  constructor(private readonly areaUbicacionService: AreaUbicacionService) {}
+  constructor(private readonly areaUbicacionService: AreaUbicacionService) { }

-  @Get()
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
+  @Get()  
  findAll() {
    return this.areaUbicacionService.findAll();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get(':id')
  findOne(@Param('id') id: string) {
    return this.areaUbicacionService.findOne(+id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get('/programs/:id')
-  findProgramsByArea(@Param('id')id:number){
+  findProgramsByArea(@Param('id') id: number) {
    return this.areaUbicacionService.findProgramsByArea(+id)
  }
 }
@@ -1,26 +1,38 @@
-import { Controller, Get, Post, Body, Param, Patch } from '@nestjs/common';
+import { Controller, Get, Post, Body, Param, Patch, UseGuards } from '@nestjs/common';
 import { BitacoraService } from './bitacora.service';
 import { BitacoraAlumnoDto, CreateBitacoraDto, EquiposPorEquipoDto } from './dto/create-bitacora.dto';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('bitacora')
 export class BitacoraController {
  constructor(private readonly bitacoraService: BitacoraService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Post()
  assignment(@Body() createBitacoraDto: CreateBitacoraDto) {
    return this.bitacoraService.assignment(createBitacoraDto);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Get('/cuenta/:id')
  findOneByAcount(@Param('id') id: string) {
    return this.bitacoraService.findOneByAcount(+id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Get('/equipo/:id')
  findOneByMachine(@Param('id') id: string) {
    return this.bitacoraService.findOneByMachine(+id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Patch('cancelar/:id')
  cancelationByMachine(
    @Param('id') id: number,
@@ -29,12 +41,15 @@ export class BitacoraController {
    return this.bitacoraService.cancelation(id, tiempo_asignado);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get()
  findAll() {
    return this.bitacoraService.findAll();
  }

-
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post('equipos-por-dia')
  async obtenerEquipos(
    @Body() dto: BitacoraAlumnoDto
@@ -45,6 +60,8 @@ export class BitacoraController {
    );
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post('equipos-por-equipo')
  async equiposPorEquipo(
    @Body() dto: EquiposPorEquipoDto,
@@ -5,45 +5,63 @@ import {
  Body,
  Patch,
  Param,
-  Delete,
+  UseGuards,
 } from '@nestjs/common';
 import { BitacoraMesaService } from './bitacora_mesa.service';
 import { CreateBitacoraMesaDto, FindByDate } from './dto/create-bitacora_mesa.dto';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('bitacora-mesa')
 export class BitacoraMesaController {
  constructor(private readonly bitacoraMesaService: BitacoraMesaService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Post()
  assignment(@Body() createBitacoraMesaDto: CreateBitacoraMesaDto) {
    return this.bitacoraMesaService.assignment(createBitacoraMesaDto);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get()
  findAll() {
    return this.bitacoraMesaService.findAll();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get(':id')
  findOne(@Param('id') id: string) {
    return this.bitacoraMesaService.findOne(+id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Get('/cuenta/:id_cuenta')
  findByCuenta(@Param('id_cuenta') id_cuenta: string) {
    return this.bitacoraMesaService.findByCuenta(+id_cuenta);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Get('/table/:id_mesa')
  findByTable(@Param('id_mesa') id_mesa: number) {
    return this.bitacoraMesaService.findByTable(id_mesa);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post('/date')
  findByDate(@Body() data: FindByDate) {
    return this.bitacoraMesaService.findByDate(data.date);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Patch('cancelar/:id')
  cancelationByMachine(
    @Param('id') id: number,
@@ -52,6 +70,8 @@ export class BitacoraMesaController {
    return this.bitacoraMesaService.cancelation(id, tiempo_asignado);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post('mesas-por-dia')
  mesasPorDia(@Body() body: { fecha: string }) {
    return this.bitacoraMesaService.mesasPorFecha(body.fecha);
@@ -1,11 +1,17 @@
-import { Controller, Get } from '@nestjs/common';
+import { Controller, Get, UseGuards } from '@nestjs/common';
 import { CarreraService } from './carrera.service';
 import { Carrera } from './entities/carrera.entity';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('carrera')
 export class CarreraController {
-  constructor(private readonly carreraService: CarreraService) {}
+  constructor(private readonly carreraService: CarreraService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Get()
  findAll(): Promise<Carrera[]> {
    return this.carreraService.findAll();
@@ -1,13 +1,25 @@
-import { Controller, Get, Post, Body, Patch, Param, Delete } from '@nestjs/common';
+import { Controller, Get, Param, UseGuards } from '@nestjs/common';
 import { CostoService } from './costo.service';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Role } from 'src/role.enum';
+import { Roles } from 'src/roles.decorator';

@Controller('costo')
 export class CostoController {
-  constructor(private readonly costoService: CostoService) {}
+  constructor(private readonly costoService: CostoService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL,Role.PCPUMA)
  @Get()
  findAll() {
    return this.costoService.findAll();
  }
-
+  
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
+  @Get('/:id_servicio')
+  find(@Param('id_servicio') id_servicio: number) {
+    return this.costoService.find(id_servicio);
+  }
 }
@@ -6,9 +6,14 @@ import { Repository } from 'typeorm';
@Injectable()
 export class CostoService {
  constructor(@InjectRepository(Costo)
-  private readonly CostoRepository: Repository<Costo>) { }
+  private readonly CostoRepository: Repository<Costo>) {}
+  
  findAll() {
    return this.CostoRepository.find();
  }

+  find(id_servicio: number) {
+    return this.CostoRepository.find({ where: { id_servicio } });
+  }
+
 }
@@ -1,20 +1,41 @@
-import { Body, Controller, Get, Post } from '@nestjs/common';
+import { Body, Controller, Get, Post, Query, UseGuards } from '@nestjs/common';
 import { DetalleServicioService } from './detalle_servicio.service';
 import { FindReciboByRangeDto } from 'src/recibo/dto/create-recibo.dto';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';


@Controller('detalle-servicio')
 export class DetalleServicioController {
-  constructor(private readonly detalleServicioService: DetalleServicioService) {}
+  constructor(private readonly detalleServicioService: DetalleServicioService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get()
-  findAll(){
+  findAll() {
    return this.detalleServicioService.findAll()
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post('rango')
  async findByDateRange(@Body() data: FindReciboByRangeDto) {
    return this.detalleServicioService.findByDateRange(data.desde, data.hasta);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
+  @Get('totales-por-periodo')
+  async getTotalesPorPeriodo(
+    @Query('periodoInicio') periodoInicio?: string,
+    @Query('periodoFin') periodoFin?: string,
+    @Query('servicioId') servicioId?: string,
+  ) {
+    const inicio = periodoInicio ? parseInt(periodoInicio) : undefined;
+    const fin = periodoFin ? parseInt(periodoFin) : undefined;
+    const servicio = servicioId ? parseInt(servicioId) : undefined;
+    return this.detalleServicioService.getTotalesPorServicioYPeriodo(inicio, fin, servicio);
+  }
 }
@@ -35,4 +35,42 @@ export class DetalleServicioService {
      .addGroupBy('servicio.servicio')
      .getRawMany();
  }
+
+async getTotalesPorServicioYPeriodo(periodoInicio?: number, periodoFin?: number, servicioId?: number) {
+  const query = this.detalleServicioRepository
+    .createQueryBuilder('ds')
+    .select('s.servicio', 'nombre_servicio')
+    .addSelect('p.semestre', 'periodo')
+    .addSelect('p.id_periodo', 'id_periodo')
+    .addSelect('SUM(ds.monto)', 'monto_total')
+    .innerJoin('ds.servicio', 's')
+    .innerJoin('ds.periodo', 'p');
+
+  if (periodoInicio && periodoFin) {
+    query.andWhere('p.id_periodo BETWEEN :inicio AND :fin', { inicio: periodoInicio, fin: periodoFin });
+  } else if (periodoInicio) {
+    query.andWhere('p.id_periodo >= :inicio', { inicio: periodoInicio });
+  } else if (periodoFin) {
+    query.andWhere('p.id_periodo <= :fin', { fin: periodoFin });
+  }
+
+  if (servicioId) {
+    query.andWhere('s.id_servicio = :servicioId', { servicioId });
+  }
+
+  const resultados = await query
+    .groupBy('s.id_servicio')
+    .addGroupBy('p.id_periodo')
+    .orderBy('p.id_periodo')
+    .addOrderBy('s.servicio')
+    .getRawMany();
+
+  return resultados.map(item => ({
+    nombre_servicio: item.nombre_servicio,
+    periodo: item.periodo,
+    monto_total: parseFloat(item.monto_total) || 0,
+  }));
 }
+  
+}
+//IO
@@ -1,57 +1,81 @@
-import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common';
+import { Body, Controller, Get, Param, Patch, Post, UseGuards } from '@nestjs/common';
 import { EquipoService } from './equipo.service';
 import { Equipo } from './entities/equipo.entity';
 import { CreateEquipoDto, UpdateAreaEquiposDto } from './dto/create-equipo.dto';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('equipo')
 export class EquipoController {
  constructor(private readonly equipoService: EquipoService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
  @Get()
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR, Role.ATENCION_USUARIOS, Role.SERVICIO_SOCIAL)
  findAll(): Promise<Equipo[]> {
    return this.equipoService.findAll();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Get('/active')
  findActive() {
    return this.equipoService.findActive();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get('/disable')
  findDisable() {
    return this.equipoService.findDisable();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Get('/student/:id')
  findOnlyUsable(@Param('id') id: number): Promise<Equipo[]> {
    return this.equipoService.findOnlyUsable(+id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get('/busy')
  findOnlyBusy(): Promise<Equipo[]> {
    return this.equipoService.findOnlyBusy();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get(':id')
  findOne(@Param('id') id: string): Promise<Equipo> {
    return this.equipoService.findOne(id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post()
  create(@Body() equipo: CreateEquipoDto) {
    return this.equipoService.create(equipo);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Patch()
  update(@Body() equipo: CreateEquipoDto) {
    return this.equipoService.update(equipo);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR, Role.ATENCION_USUARIOS, Role.SERVICIO_SOCIAL)
  @Patch(':id/activo')
  toggleActivo(@Param('id') id: number) {
    return this.equipoService.toggleActivo(+id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR,Role.ATENCION_USUARIOS,Role.SERVICIO_SOCIAL)
  @Patch('actualizar-area')
  actualizarPorArea(
    @Body() updateAreaEquiposDto: UpdateAreaEquiposDto,
@@ -1,17 +1,22 @@
-import { Controller, Get, Post, Body, Patch, Param, Delete } from '@nestjs/common';
+import { Controller, Get, Param, UseGuards } from '@nestjs/common';
 import { MensajeService } from './mensaje.service';
-import { CreateMensajeDto } from './dto/create-mensaje.dto';
-import { UpdateMensajeDto } from './dto/update-mensaje.dto';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('mensaje')
 export class MensajeController {
-  constructor(private readonly mensajeService: MensajeService) {}
+  constructor(private readonly mensajeService: MensajeService) { }

-  @Get()
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Get()  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  findAll() {
    return this.mensajeService.findAll();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get(':id')
  findOne(@Param('id') id: string) {
    return this.mensajeService.findOne(+id);
@@ -1,26 +1,38 @@
-import { Controller, Body, Patch, Param, Get } from '@nestjs/common';
+import { Controller, Body, Patch, Param, Get, UseGuards } from '@nestjs/common';
 import { MesaService } from './mesa.service';
 import { UpdateMesaDto } from './dto/update-mesa.dto';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Role } from 'src/role.enum';
+import { Roles } from 'src/roles.decorator';

@Controller('mesa')
 export class MesaController {
  constructor(private readonly mesaService: MesaService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @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)
  @Get('activo')
  async findAllActivo() {
    return this.mesaService.findAllActivo();
  }
-
+  
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @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)
  @Patch(':id')
  async updateActivo(
    @Param('id') id: number,
@@ -29,6 +41,8 @@ export class MesaController {
    return this.mesaService.updateActivo(id, updateMesaDto);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @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);
@@ -1,26 +1,38 @@
-import { Body, Controller, Delete, Get, Param, Patch, Post, Put } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Patch, Post, Put, UseGuards } from '@nestjs/common';
 import { PeriodoService } from './periodo.service';
 import { CreatePeriodoDto, ModifiedDateDto } from './dto/create-periodo.dto';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('periodo')
 export class PeriodoController {
    constructor(private readonly periodoService: PeriodoService) { }

+    @UseGuards(JwtAuthGuard, RolesGuard)
+    @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
    @Get()
    findAll() {
        return this.periodoService.findAll();
    }

+    @UseGuards(JwtAuthGuard, RolesGuard)
+    @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
    @Post()
    create(@Body() data: CreatePeriodoDto) {
        return this.periodoService.create(data);
    }

+    @UseGuards(JwtAuthGuard, RolesGuard)
+    @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
    @Delete("/:id_periodo")
    delete(@Param("id_periodo") id_periodo: number) {
        return this.periodoService.delete(id_periodo)
    }

+    @UseGuards(JwtAuthGuard, RolesGuard)
+    @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
    @Patch("/date/:id_periodo")
    modifiedDate(@Body() data: ModifiedDateDto, @Param("id_periodo") id_periodo: number) {
        return this.periodoService.modifiedDate(data, id_periodo)
@@ -16,7 +16,7 @@ export class PeriodoService {
  }

  async findAll() {
-    return this.periodoRepository.find();
+    return this.periodoRepository.find({order:{'id_periodo':"DESC"}});
  }

  async getPeriodoActivo(): Promise<Periodo> {
@@ -32,7 +32,7 @@ export class PeriodoService {
    return periodo;
  }

-    async getPeriodoActivoWhitoutError(): Promise<Periodo | null> {
+  async getPeriodoActivoWhitoutError(): Promise<Periodo | null> {
    const periodo = await this.periodoRepository.findOne({
      where: { activo: true },
      order: { id_periodo: 'DESC' },
@@ -45,7 +45,7 @@ export class PeriodoService {
    await this.periodoRepository.delete(id_periodo)
  }

-  async periodoDisable(id_periodo:number) {
+  async periodoDisable(id_periodo: number) {
    await this.periodoRepository.update(id_periodo, { activo: false })
  }

@@ -58,7 +58,7 @@ export class PeriodoService {

    const periodoActive = await this.getPeriodoActivoWhitoutError();

-    if(periodoActive){
+    if (periodoActive) {
      await this.periodoDisable(periodoActive.id_periodo)
    }

@@ -66,7 +66,7 @@ export class PeriodoService {
    return this.periodoRepository.save(create)
  }

-  async modifiedDate(data:ModifiedDateDto,id_periodo){
-    return this.periodoRepository.update(id_periodo,data)
+  async modifiedDate(data: ModifiedDateDto, id_periodo) {
+    return this.periodoRepository.update(id_periodo, data)
  }
 }
@@ -1,31 +1,45 @@
-import { Controller, Get, Post, Body, Patch, Param, Delete } from '@nestjs/common';
+import { Controller, Get, Post, Body, Patch, Param, Delete, UseGuards } from '@nestjs/common';
 import { ProgramaService } from './programa.service';
 import { UpdateProgramaDto } from './dto/update-programa.dto';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('programa')
 export class ProgramaController {
  constructor(private readonly programaService: ProgramaService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get()
  findAll() {
    return this.programaService.findAll();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get(':id')
  findOne(@Param('id') id: string) {
    return this.programaService.findOne(+id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post()
  create(@Body() body) {
    return this.programaService.create(body);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Patch(':id')
  update(@Param('id') id: string, @Body() updateProgramaDto: UpdateProgramaDto) {
    return this.programaService.update(+id, updateProgramaDto);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Delete(':id')
  delete(@Param('id') id:string){
    return this.programaService.delete(+id);
@@ -1,26 +1,39 @@
-import { Controller, Get, Body, Patch, Param } from '@nestjs/common';
+import { Controller, Get, Body, Patch, Param, UseGuards } from '@nestjs/common';
 import { ProgramaEquipoService } from './programa_equipo.service';
 import { UpdateProgramaEquipoDto, UpdateProgramasSalaDto } from './dto/update-programa_equipo.dto';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('programa-equipo')
 export class ProgramaEquipoController {
-  constructor(private readonly programaEquipoService: ProgramaEquipoService) {}
+  constructor(private readonly programaEquipoService: ProgramaEquipoService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get('programas/:id')
  findAllProgramByNumber(@Param('id') id: number) {
    return this.programaEquipoService.findAllProgramByNumber(+id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
+
  @Get('ubicacion/:id')
  findAllProgramByUbicacion(@Param('id') id: string) {
    return this.programaEquipoService.findAllProgramByUbication(id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get(':id')
  findOne(@Param('id') id: string) {
    return this.programaEquipoService.findOne(id);
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Patch('equipo/:id')
  updateMachine(
    @Param('id') id: string,
@@ -32,6 +45,8 @@ export class ProgramaEquipoController {
    );
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Patch('sala')
  updateBySala(@Body() dto: UpdateProgramasSalaDto) {
    return this.programaEquipoService.updateBySala(dto.sala, dto.programas);
@@ -3,15 +3,20 @@ import {
  Post,
  Body,
  UseGuards,
-  Req,
 } from '@nestjs/common';
 import { ReciboService } from './recibo.service';
 import { FindReciboByRangeDto } from './dto/create-recibo.dto';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('recibo')
 export class ReciboController {
-  constructor(private readonly reciboService: ReciboService) {}
+  constructor(private readonly reciboService: ReciboService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post('rango')
  async findByDateRange(@Body() data: FindReciboByRangeDto) {
    return this.reciboService.findByDateRange(data.desde, data.hasta);
@@ -1,5 +1,7 @@
-
 export enum Role {
-  ADMINISTRADOR = 'ADMINISTRADOR',
-  OPERADOR = 'OPERADOR',
-}
+  ADMINISTRADOR = 1,
+  ATENCION_USUARIOS = 2,
+  SERVICIO_SOCIAL = 3,
+  SUPER_ADMINISTRADOR = 4,
+  PCPUMA = 5,
+}
@@ -6,7 +6,7 @@ import { ROLES_KEY } from './roles.decorator';

@Injectable()
 export class RolesGuard implements CanActivate {
-  constructor(private reflector: Reflector) {}
+  constructor(private reflector: Reflector) { }

  canActivate(context: ExecutionContext): boolean {
    const requiredRoles = this.reflector.getAllAndOverride<Role[]>(ROLES_KEY, [
@@ -17,6 +17,6 @@ export class RolesGuard implements CanActivate {
      return true;
    }
    const { user } = context.switchToHttp().getRequest();
-    return requiredRoles.some((role) => user.role?.includes(role));
+    return requiredRoles.some((role) => user.role === role);
  }
 }
@@ -1,14 +1,22 @@
-import { Controller, Get, Param } from '@nestjs/common';
+import { Controller, Get, Param, UseGuards } from '@nestjs/common';
 import { SancionService } from './sancion.service';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';
@Controller('sancion')
 export class SancionController {
-  constructor(private readonly sancionService: SancionService) {}
+  constructor(private readonly sancionService: SancionService) { }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get()
  find() {
    return this.sancionService.find();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get(':id')
  findOne(@Param('id') id: number) {
    return this.sancionService.findOne(+id);
@@ -1,9 +1,16 @@
-import { Controller, Get } from '@nestjs/common';
+import { Controller, Get, UseGuards } from '@nestjs/common';
 import { ServicioService } from './servicio.service';
+import { JwtAuthGuard } from 'src/user/jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('servicio')
 export class ServicioController {
-  constructor(private readonly servicioService: ServicioService) {}
+  constructor(private readonly servicioService: ServicioService) { }
+
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get()
  findAll() {
    return this.servicioService.findAll();
@@ -4,29 +4,48 @@ import {
  Post,
  Body,
  UseGuards,
-  Request,
  Res,
  Req,
+  Param,
+  Patch,
 } from '@nestjs/common';
 import type { Response } from 'express';
 import { UserService } from './user.service';
 import { changePasswordDto, CreateUserDto, Login } from './dto/create-user.dto';
 import { JwtAuthGuard } from './jwt.guard';
+import { RolesGuard } from 'src/roles.guard';
+import { Roles } from 'src/roles.decorator';
+import { Role } from 'src/role.enum';

@Controller('user')
 export class UserController {
-  constructor(private readonly userService: UserService) {}
+  constructor(private readonly userService: UserService) { }
+
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
+
+  @Get('/switch/:id')
+  async getactive(@Param('id') id:number) {
+    return this.userService.getactive(id);
+  }

  @Get()
  async getAll() {
    return this.userService.getAll();
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Get('/perfil')
  async getAllPerfil() {
    return this.userService.getAllPerfil();
  }

+@Patch(':id/activo')
+toggleActivo(@Param('id') id: number) {
+  return this.userService.toggleActivo(id);
+}
+
  @Post()
  async Login(@Body() data: Login, @Res() res: Response) {
    return this.userService.Login(data, res);
@@ -38,12 +57,17 @@ export class UserController {
    return req.user.role;
  }

+  @UseGuards(JwtAuthGuard, RolesGuard)
+
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
+
  @Post('/create')
  async createUser(@Body() data: CreateUserDto) {
    return this.userService.create(data);
  }

-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles(Role.ADMINISTRADOR, Role.SUPER_ADMINISTRADOR)
  @Post('/changePassword')
  async changePassword(@Body() data: changePasswordDto, @Req() req) {
    const id_usuario = req.user.id;
@@ -20,6 +20,37 @@ export class UserService {
    private perfilRepository: Repository<Perfil>,
    private jwtService: JwtService,
  ) {}
+  async toggleActivo(id: number) {
+
+  const usuario = await this.userRepository.findOne({
+    where: { id_usuario: id }
+  });
+
+  
+  if(!usuario){
+    throw new  NotFoundException("no se encontro usuario")
+}
+ 
+
+  usuario.activo = usuario.activo === 1 ? 0 : 1;
+
+  return this.userRepository.save(usuario);
+}
+
+
+async getactive(id: number) {
+  const user = await this.userRepository.findOne({
+    where: { id_usuario: id },
+  });
+
+  if (!user) {
+    throw new NotFoundException('Usuario no encontrado');
+  }
+
+  user.activo = user.activo === 1 ? 0 : 1;
+
+  return this.userRepository.save(user);
+}

  async findOneByNameandPassword(data: Login): Promise<User> {
    const { usuario, password } = data;
@@ -40,14 +71,14 @@ export class UserService {

    const payload = {
      id: user.id_usuario,
-      usuario: user.usuario,
+      usuario: user.nombre,
      role: user.perfil.id_perfil,
    };
    const token = await this.jwtService.signAsync(payload);

    res.cookie('token', token, {
      httpOnly: true,
-      secure: process.env.NODE_ENV === 'production', // en dev desactívalo
+      secure: process.env.NODE_ENV === 'production',
      sameSite: 'strict',
      path: '/',
    });
Author	SHA1	Message	Date
frcarlos	3bb95a3d50	@Patch idactivo	2026-03-05 14:41:19 -05:00
frcarlos	81ad881d6a	merge	2026-03-04 14:20:47 -05:00
IO	04290f4097	merge axel	2026-03-03 17:41:06 -06:00
IO	22431dd73e	Merge branch 'Axel' of repositorio.acatlan.unam.mx:IO/api-AT	2026-03-03 17:37:43 -06:00
IO	9ddff920fb	npm audit fix	2026-03-03 17:37:36 -06:00
Tyrannuss	a42cfb6247	se agregaron endpoints para ver el monto total por servico filtrando por el periodo de inicio y el periodo de termino	2026-03-03 17:25:25 -06:00
IO	c4c14f8520	added IO	2026-03-02 18:50:31 -06:00
IO	9c07860840	Merge branch 'develop'	2026-03-02 18:39:07 -06:00
IO	53ab8c5c27	modified get periodo and return user	2026-03-02 18:38:42 -06:00
IO	0323c93ca3	added all roles	2026-03-02 14:49:15 -06:00
IO	8aa0eab353	delete error about sancion	2026-03-02 12:05:08 -06:00
IO	a96187a10f	fixed error get student whit error	2026-03-02 12:00:11 -06:00
IO	07e7160242	merge master	2026-02-27 19:23:56 -06:00
IO	1584e16a46	merge carlos	2026-02-27 19:22:56 -06:00
IO	9e836fb947	delete sommeting that not used	2026-02-27 10:56:57 -06:00
IO	8f65896390	Merge branch 'master' into develop	2026-02-26 11:25:58 -06:00
IO	45e91e5c3f	Merge branch 'master' into develop	2026-02-25 13:59:05 -06:00
IO	46d98e2a6b	new ep uso and new ep in costo	2026-02-25 13:01:34 -06:00
IO	b6594bd879	Merge branch 'master' into develop	2026-02-24 11:30:18 -06:00
IO	18b869d681	added guard jwt	2026-02-23 18:16:17 -06:00
IO	472bfebb7a	fixed ep mesa	2026-02-23 18:05:09 -06:00