Merge branch 'master' of https://github.com/MatheusSanchez/orange-back …

…into SFD-30
MatheusSanchez · Feb 3, 2024 · 7609eb4 · 7609eb4
2 parents 21ab8f8 + 0fa3632
commit 7609eb4
Show file tree

Hide file tree

Showing 39 changed files with 1,010 additions and 129 deletions.
diff --git a/.env.example b/.env.example
@@ -7,6 +7,8 @@ FRONTEND_URL="http://127.0.0.1:5173" # http://localhost:5173
 STORAGE_TYPE = "local"
 
 AWS_S3_URL = ""
-REGION = '',
-ACCESS_KEY_ID ='',
-BUCKET_NAME = ""
+REGION = ''
+ACCESS_KEY_ID =''
+SECRET_ACCESS_KEY = ''
+BUCKET_NAME = ""
+
diff --git a/package.json b/package.json
@@ -17,7 +17,8 @@
     "test:e2e": "vitest run --dir src/controller",
     "test:e2e:coverage": "vitest run --dir src/controller --coverage",
     "test:e2e:watch": "vitest --dir src/controller",
-    "test:coverage": "vitest run --coverage"
+    "test:coverage": "vitest run --coverage",
+    "debug": "ts-node-dev --respawn --transpile-only src/server.ts --debug"
   },
   "keywords": [],
   "author": "",
@@ -32,6 +33,7 @@
     "npm-run-all": "^4.1.5",
     "prisma": "5.8.1",
     "supertest": "^6.3.4",
+    "ts-node-dev": "^2.0.0",
     "tsx": "^4.7.0",
     "typescript": "^5.3.3",
     "vitest": "^1.2.1"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/prisma/migrations/20240202214129_add_country_user/migration.sql b/prisma/migrations/20240202214129_add_country_user/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "country" TEXT NOT NULL DEFAULT 'brasil';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "User" ADD COLUMN "country" TEXT NOT NULL DEFAULT 'brasil';