fix: no timezone option (#29)

- always use UTC
line · Aug 23, 2023 · 36ac69d · 36ac69d
1 parent 6d65012
commit 36ac69d
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 42 deletions.
diff --git a/apps/api/README.md b/apps/api/README.md
@@ -89,7 +89,6 @@ npm run migration:run
 | AUTO_MIGRATION       | set 'true' if you want to make the database migration automatically              |                                                                    |
 | MASTER_API_KEY       | set a key if you want to make a master key for creating feedback                 |                                                                    |
 | NODE_OPTIONS         | set some options if you want to add for node execution (e.g. max_old_space_size) |                                                                    |
-| TZ                   | set timezone of the mysql database server if it is not UTC (e.g. +09:00)         | +00:00                                                             |
 
 ## Learn More
 

diff --git a/apps/api/src/configs/modules/typeorm-config/typeorm-config.service.ts b/apps/api/src/configs/modules/typeorm-config/typeorm-config.service.ts
@@ -45,7 +45,7 @@ export class TypeOrmConfigService implements TypeOrmOptionsFactory {
       logging: ['warn', 'error'],
       migrationsRun: process.env.AUTO_MIGRATION === 'true',
       namingStrategy: new SnakeNamingStrategy(),
-      timezone: process.env.TZ,
+      timezone: '+00:00',
     };
   }
 }
diff --git a/apps/api/src/configs/mysql.config.ts b/apps/api/src/configs/mysql.config.ts
@@ -25,7 +25,6 @@ export const mySqlConfigSchema = yup.object({
     .default(
       '["mysql://userfeedback:userfeedback@localhost:13306/userfeedback"]',
     ),
-  TZ: yup.string().default('+00:00'),
 });
 
 export const mysqlConfig = registerAs('mysql', () => ({

diff --git a/apps/api/src/domains/feedback/feedback.mysql.service.ts b/apps/api/src/domains/feedback/feedback.mysql.service.ts
@@ -139,30 +139,12 @@ export class FeedbackMySQLService {
         );
       } else if (fieldKey === 'createdAt') {
         const { gte, lt } = value as TimeRange;
-        queryBuilder.andWhere(
-          'CONVERT_TZ(feedbacks.created_at, :timezone, "+00:00") >= :gte',
-          { timezone: process.env.TZ, gte },
-        );
-        queryBuilder.andWhere(
-          'CONVERT_TZ(feedbacks.created_at, :timezone, "+00:00") < :lt',
-          { timezone: process.env.TZ, lt },
-        );
+        queryBuilder.andWhere('feedbacks.created_at >= :gte', { gte });
+        queryBuilder.andWhere('feedbacks.created_at < :lt', { lt });
       } else if (fieldKey === 'updatedAt') {
         const { gte, lt } = value as TimeRange;
-        queryBuilder.andWhere(
-          'CONVERT_TZ(feedbacks.updated_at, :timezone, "+00:00") >= :gte',
-          {
-            timezone: process.env.TZ,
-            gte,
-          },
-        );
-        queryBuilder.andWhere(
-          'CONVERT_TZ(feedbacks.updated_at, :timezone, "+00:00") < :lt',
-          {
-            timezone: process.env.TZ,
-            lt,
-          },
-        );
+        queryBuilder.andWhere('feedbacks.updated_at >= :gte', { gte });
+        queryBuilder.andWhere('feedbacks.updated_at < :lt', { lt });
       } else {
         const { id, format, type } = fields.find((v) => v.key === fieldKey);
 

diff --git a/apps/api/src/domains/project/issue/issue.service.ts b/apps/api/src/domains/project/issue/issue.service.ts
@@ -77,16 +77,14 @@ export class IssueService {
 
     if (query.createdAt) {
       andWhere.createdAt = Raw(
-        (alias) =>
-          `CONVERT_TZ(${alias}, '${process.env.TZ}', '+00:00') >= :gte AND CONVERT_TZ(${alias}, '${process.env.TZ}', '+00:00') < :lt`,
+        (alias) => `${alias} >= :gte AND ${alias} < :lt`,
         query.createdAt as TimeRange,
       );
     }
 
     if (query.updatedAt) {
       andWhere.updatedAt = Raw(
-        (alias) =>
-          `CONVERT_TZ(${alias}, '${process.env.TZ}', '+00:00') >= :gte AND CONVERT_TZ(${alias}, '${process.env.TZ}', '+00:00') < :lt`,
+        (alias) => `${alias} >= :gte AND ${alias} < :lt`,
         query.updatedAt as TimeRange,
       );
     }

diff --git a/apps/api/src/domains/user/user.service.ts b/apps/api/src/domains/user/user.service.ts
@@ -54,14 +54,10 @@ export class UserService {
             const { lt, gte } = value as any;
             return {
               ...prev,
-              createdAt: Raw(
-                (alias) =>
-                  `CONVERT_TZ(${alias}, '${process.env.TZ}', '+00:00') >= :gte AND CONVERT_TZ(${alias}, '${process.env.TZ}', '+00:00') < :lt`,
-                {
-                  lt,
-                  gte,
-                },
-              ),
+              createdAt: Raw((alias) => `${alias} >= :gte AND ${alias} < :lt`, {
+                lt,
+                gte,
+              }),
             };
           }
           return { ...prev, [key]: Like(`%${value}%`) };

diff --git a/apps/api/src/utils/test-utils.ts b/apps/api/src/utils/test-utils.ts
@@ -76,7 +76,7 @@ export const TestTypeOrmConfig = TypeOrmModule.forRootAsync({
       entities: [join(__dirname, '../**/*.entity.{ts,js}')],
       logging: ['warn', 'error'],
       namingStrategy: new SnakeNamingStrategy(),
-      timezone: process.env.TZ,
+      timezone: '+00:00',
     };
   },
 });

diff --git a/turbo.json b/turbo.json
@@ -2,11 +2,16 @@
   "$schema": "https://turbo.build/schema.json",
   "pipeline": {
     "build": {
-      "outputs": ["dist/**", ".next/**", "public/dist/**"],
-      "dependsOn": ["^build"],
+      "outputs": [
+        "dist/**",
+        ".next/**",
+        "public/dist/**"
+      ],
+      "dependsOn": [
+        "^build"
+      ],
       "env": [
         "NODE_ENV",
-        "TZ",
         "SESSION_PASSWORD",
         "API_BASE_URL",
         "NEXT_PUBLIC_API_BASE_URL",
@@ -38,4 +43,4 @@
       "cache": false
     }
   }
-}
+}