From 930191569f12b89c5a18460f447e71c54358dfc8 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Sun, 23 Jul 2023 18:07:11 +0900
Subject: [PATCH] Fix upload file issue

---
 back/src/users/users.service.ts | 4 ++--
 data/.gitignore                 | 1 +
 docker-compose.dev.yml          | 5 +----
 docker-compose.prod.yml         | 5 +----
 docker-compose.yml              | 3 +--
 5 files changed, 6 insertions(+), 12 deletions(-)
 create mode 100644 data/.gitignore

diff --git a/back/src/users/users.service.ts b/back/src/users/users.service.ts
index ca65b8d..55c12b5 100644
--- a/back/src/users/users.service.ts
+++ b/back/src/users/users.service.ts
@@ -81,10 +81,10 @@ export class UsersService {
 	}
 
 	async getProfilePicture(userId: number, res: any) {
-		const path = `/data/${userId}.png`;
+		const path = `/data/${userId}.jpg`;
 		if (existsSync(path)) {
 			const file = createReadStream(path);
-			return new StreamableFile(file);
+			return file.pipe(res);
 		}
 		// We could not find a profile icon locally, using gravatar instead.
 		const user = await this.user({ id: userId });
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 0000000..72e8ffc
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index e011bb6..f4b8398 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - ./back:/app
       - ./assets:/assets
-      - data:/data
+      - ./data:/data
     depends_on:
       db:
         condition: service_healthy
@@ -55,6 +55,3 @@ services:
       - "back"
     env_file:
       - .env
-
-volumes:
-  data:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index bd901c4..ed94396 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -10,7 +10,7 @@ services:
       - .env
     volumes:
       - ./assets:/assets
-      - data:/data
+      - ./data:/data
   scorometer:
     image: ghcr.io/chroma-case/scorometer:main
     ports:
@@ -44,6 +44,3 @@ services:
       - "back"
     env_file:
       - .env
-
-volumes:
-  data:
diff --git a/docker-compose.yml b/docker-compose.yml
index 3ddf329..af5e44b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - .env
     volumes:
       - ./assets:/assets
-      - data:/data
+      - ./data:/data
   scorometer:
     build: ./scorometer
     ports:
@@ -53,4 +53,3 @@ services:
 
 volumes:
   db:
-  data: