chore: resolve conflict

merge conflict in commit 1ee38ca
GabrielDeSouzza · Mar 10, 2024 · 5f8b55a · 5f8b55a
2 parents 1733868 + 1ee38ca
commit 5f8b55a
Show file tree

Hide file tree

Showing 30 changed files with 503 additions and 439 deletions.
diff --git a/.env.development b/.env.development
@@ -1,6 +1,11 @@
 DATABASE_URL="postgresql://admin:admin@db_tms/db_tms?schema=public"
 
+CLOUDINARY_CLOUD_NAME=
+CLOUDINARY_API_KEY=
+CLOUDINARY_API_SECRET=
+
 JWT_KEY=12346789
+
 POSTGRES_DB=db_tms
 POSTGRES_USER=admin
 POSTGRES_PASSWORD=admin
diff --git a/.env.example b/.env.example
@@ -1 +1,5 @@
 DATABASE_URL="postgresql://user:password@localhost:5432/mydb?schema=public"
+
+CLOUDINARY_CLOUD_NAME=
+CLOUDINARY_API_KEY=
+CLOUDINARY_API_SECRET=
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -12,15 +12,20 @@
     "import/resolver": {
       "typescript": {},
       "node": {
-        "extensions": [".js", ".ts"]
+        "extensions": [
+          ".js",
+          ".ts"
+        ]
       }
     }
   },
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaVersion": 13,
     "sourceType": "module",
-    "project": ["./tsconfig.eslint.json"]
+    "project": [
+      "./tsconfig.eslint.json"
+    ]
   },
   "extends": [
     "prettier",
@@ -44,42 +49,58 @@
   ],
   "overrides": [
     {
-      "files": ["main.ts"],
+      "files": [
+        "main.ts"
+      ],
       "rules": {
         "unicorn/prefer-top-level-await": "off",
         "@typescript-eslint/no-floating-promises": "off"
       }
     },
     {
-      "files": ["prisma.service.ts"],
+      "files": [
+        "prisma.service.ts"
+      ],
       "rules": {
         "@typescript-eslint/no-unsafe-call": "off",
         "@typescript-eslint/require-await": "off",
         "@typescript-eslint/no-misused-promises": "off"
       }
     },
     {
-      "files": ["test/**"],
+      "files": [
+        "test/**"
+      ],
       "rules": {
         "jest/expect-expect": "off"
       }
     },
     {
-      "files": ["jest.config.ts", "commitlint.config.ts"],
+      "files": [
+        "jest.config.ts",
+        "commitlint.config.ts"
+      ],
       "rules": {
         "import/no-default-export": "off"
       }
     },
     {
-      "files": ["**.js"],
+      "files": [
+        "**.js"
+      ],
       "rules": {
         "no-undef": "off",
         "unicorn/prefer-module": "off",
         "@typescript-eslint/no-var-requires": "off"
       }
     },
     {
-      "files": ["spec.ts", "spec.tsx", "test.ts", "test.tsx"],
+      "files": [
+        "spec.ts",
+        "spec.tsx",
+        "test.ts",
+        "test.tsx"
+      ],
       "rules": {
         "unicorn/prefer-module": "off",
         "@typescript-eslint/no-var-requires": "off"
@@ -92,7 +113,9 @@
       }
     },
     {
-      "files": ["**.d.ts"],
+      "files": [
+        "**.d.ts"
+      ],
       "rules": {
         "@typescript-eslint/naming-convention": "off",
         "@typescript-eslint/no-empty-interface": "off",
@@ -105,28 +128,36 @@
       }
     },
     {
-      "files": ["src/helpers/*"],
+      "files": [
+        "src/helpers/*"
+      ],
       "rules": {
         "@typescript-eslint/naming-convention": "off"
       }
     },
     {
-      "files": ["src/dtos/*"],
+      "files": [
+        "src/dtos/*"
+      ],
       "rules": {
         "unicorn/filename-case": "off",
         "@typescript-eslint/naming-convention": [
           "error",
           {
             "selector": "interface",
-            "format": ["PascalCase"],
+            "format": [
+              "PascalCase"
+            ],
             "custom": {
               "regex": "[A-Z]*DTO$",
               "match": true
             }
           },
           {
             "selector": "typeAlias",
-            "format": ["PascalCase"],
+            "format": [
+              "PascalCase"
+            ],
             "custom": {
               "regex": "[A-Z]*DTO$",
               "match": true
@@ -155,16 +186,29 @@
     "import/prefer-default-export": "off",
     "@darraghor/nestjs-typed/injectable-should-be-provided": "off",
     "@typescript-eslint/no-unsafe-call": "off",
-    "quote-props": ["error", "consistent-as-needed"],
-    "arrow-body-style": ["error", "as-needed"],
+    "@darraghor/nestjs-typed/should-specify-forbid-unknown-values": "off",
+    "quote-props": [
+      "error",
+      "consistent-as-needed"
+    ],
+    "arrow-body-style": [
+      "error",
+      "as-needed"
+    ],
     "import/no-duplicates": [
       "error",
       {
         "prefer-inline": true
       }
     ],
-    "import/consistent-type-specifier-style": ["error", "prefer-inline"],
-    "@typescript-eslint/consistent-type-definitions": ["error", "interface"],
+    "import/consistent-type-specifier-style": [
+      "error",
+      "prefer-inline"
+    ],
+    "@typescript-eslint/consistent-type-definitions": [
+      "error",
+      "interface"
+    ],
     "import/no-extraneous-dependencies": [
       "error",
       {
@@ -247,37 +291,60 @@
       "error",
       {
         "selector": "default",
-        "format": ["camelCase", "PascalCase", "snake_case", "UPPER_CASE"],
+        "format": [
+          "camelCase",
+          "PascalCase",
+          "snake_case",
+          "UPPER_CASE"
+        ],
         "filter": {
           "regex": "^_.*$",
           "match": false
         }
       },
       {
         "selector": "variable",
-        "format": ["camelCase", "UPPER_CASE"]
+        "format": [
+          "camelCase",
+          "UPPER_CASE"
+        ]
       },
       {
         "selector": "interface",
-        "format": ["PascalCase"],
+        "format": [
+          "PascalCase"
+        ],
         "custom": {
           "regex": "^I[A-Z]",
           "match": true
         }
       },
       {
         "selector": "typeAlias",
-        "format": ["PascalCase"],
+        "format": [
+          "PascalCase"
+        ],
         "custom": {
           "regex": "[A-Z]*Props$",
           "match": true
         }
       },
       {
         "selector": "variable",
-        "types": ["boolean"],
-        "format": ["PascalCase"],
-        "prefix": ["is", "should", "has", "can", "did", "will"]
+        "types": [
+          "boolean"
+        ],
+        "format": [
+          "PascalCase"
+        ],
+        "prefix": [
+          "is",
+          "should",
+          "has",
+          "can",
+          "did",
+          "will"
+        ]
       }
     ],
     "import/extensions": [
@@ -310,7 +377,11 @@
           "/^utils/",
           "/^constants/",
           "/^styles/",
-          ["parent", "sibling", "index"]
+          [
+            "parent",
+            "sibling",
+            "index"
+          ]
         ],
         "alphabetize": {
           "order": "asc",

diff --git a/package.json b/package.json
@@ -51,8 +51,6 @@
   },
   "dependencies": {
     "@apollo/server": "^4.7.5",
-    "@as-integrations/fastify": "^2.0.0",
-    "@fastify/static": "^6.10.2",
     "@nestjs/apollo": "^12.0.4",
     "@nestjs/cache-manager": "^2.0.0",
     "@nestjs/common": "^10.0.0",
@@ -61,17 +59,20 @@
     "@nestjs/jwt": "^10.1.1",
     "@nestjs/passport": "^10.0.2",
     "@nestjs/platform-express": "^10.0.0",
-    "@nestjs/platform-fastify": "^10.0.0",
     "@prisma/client": "^4.15.0",
     "bcrypt": "^5.1.1",
     "cache-manager": "^5.2.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
+    "cloudinary": "^2.0.3",
     "graphql": "^16.7.1",
+    "graphql-upload-minimal": "^1.6.0",
     "passport-jwt": "^4.0.1",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^5.0.1",
-    "rxjs": "^7.8.1"
+    "rxjs": "^7.8.1",
+    "streamifier": "^0.1.1",
+    "zod": "^3.22.4"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.6.5",
@@ -89,6 +90,7 @@
     "@types/jest": "29.5.3",
     "@types/node": "^20.2.5",
     "@types/passport-jwt": "^3.0.10",
+    "@types/streamifier": "^0.1.2",
     "@types/supertest": "^2.0.12",
     "@typescript-eslint/eslint-plugin": "^5.59.9",
     "@typescript-eslint/parser": "^5.59.9",