Fix user view join query

Laeng · May 13, 2022 · db46f54 · db46f54
1 parent c76c379
commit db46f54
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 41 deletions.
diff --git a/app/Console/Commands/PauseInactiveUser.php b/app/Console/Commands/PauseInactiveUser.php
@@ -44,7 +44,7 @@ public function __construct()
     public function handle(UserRepositoryInterface $userRepository, UserServiceContract $userService): int
     {
         $query = $userRepository->new()->newQuery()->leftJoin('user_missions', function ($join) {
-            $join->on('user_missions.id', '=', DB::raw("(SELECT max(user_missions.id) FROM user_missions WHERE user_missions.user_id = users.id)"));
+            $join->on('user_missions.id', '=', DB::raw("(SELECT max(user_missions.id) FROM user_missions WHERE user_missions.user_id = users.id AND user_missions.attended_at IS NOT NULL)"));
 
                 //->on('user_missions.user_id', '=', 'users.id')
                 //->on('user_missions.id', '=', DB::raw("(SELECT max(id) FROM user_missions WHERE user_missions.user_id = users.id)"))

diff --git a/app/Http/Controllers/App/Admin/User/ListController.php b/app/Http/Controllers/App/Admin/User/ListController.php
@@ -60,7 +60,7 @@ public function list
             if ($limit < 1 || $limit > 100) $limit = 20;
 
             $query = $this->userRepository->new()->newQuery()->leftJoin('user_missions', function ($join) {
-                $join->on('user_missions.id', '=', DB::raw("(SELECT max(user_missions.id) FROM user_missions WHERE user_missions.user_id = users.id)"));
+                $join->on('user_missions.id', '=', DB::raw("(SELECT max(user_missions.id) FROM user_missions WHERE user_missions.user_id = users.id AND user_missions.attended_at IS NOT NULL)"));
                     // OLD
                     //->on('user_missions.user_id', '=', 'users.id')
                     //->on('user_missions.id', '=', DB::raw("(SELECT max(id) FROM user_missions WHERE user_missions.user_id = users.id AND user_missions.attended_at IS NOT NULL)"));
@@ -101,7 +101,7 @@ public function list
                         $query = $query->whereNull('user_missions.attended_at')->whereDate('users.agreed_at', '<=', now()->subDays(30));
                         break;
                     case '30일이상 미참여':
-                        $query = $query->whereNotNull('user_missions.attended_at')->whereDate('user_missions.attended_at', '>=', now()->subDays(30));
+                        $query = $query->whereNotNull('user_missions.attended_at')->whereDate('user_missions.attended_at', '<=', now()->subDays(30));
                         break;
                     case '활동 정지 회원':
                         $query = $query->whereNotNull('banned_at');

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,6 +12,7 @@ services:
             - 'host.docker.internal:host-gateway'
         ports:
             - '${APP_PORT:-80}:80'
+            - '${HMR_PORT:-8080}:8080'
         environment:
             WWWUSER: '${WWWUSER}'
             LARAVEL_SAIL: 1
@@ -22,12 +23,10 @@ services:
         networks:
             - sail
         depends_on:
-            - mysql
+            - mariadb
             - redis
-            - meilisearch
-            - selenium
-    mysql:
-        image: 'mysql/mysql-server:8.0'
+    mariadb:
+        image: 'mariadb:10'
         ports:
             - '${FORWARD_DB_PORT:-3306}:3306'
         environment:
@@ -36,9 +35,10 @@ services:
             MYSQL_DATABASE: '${DB_DATABASE}'
             MYSQL_USER: '${DB_USERNAME}'
             MYSQL_PASSWORD: '${DB_PASSWORD}'
-            MYSQL_ALLOW_EMPTY_PASSWORD: 1
+            MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
         volumes:
-            - 'sail-mysql:/var/lib/mysql'
+            - 'sail-mariadb:/var/lib/mysql'
+            - './vendor/laravel/sail/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh'
         networks:
             - sail
         healthcheck:
@@ -57,38 +57,11 @@ services:
             test: ["CMD", "redis-cli", "ping"]
             retries: 3
             timeout: 5s
-    meilisearch:
-        image: 'getmeili/meilisearch:latest'
-        ports:
-            - '${FORWARD_MEILISEARCH_PORT:-7700}:7700'
-        volumes:
-            - 'sail-meilisearch:/data.ms'
-        networks:
-            - sail
-        healthcheck:
-            test: ["CMD", "wget", "--no-verbose", "--spider",  "http://localhost:7700/health"]
-            retries: 3
-            timeout: 5s
-    mailhog:
-        image: 'mailhog/mailhog:latest'
-        ports:
-            - '${FORWARD_MAILHOG_PORT:-1025}:1025'
-            - '${FORWARD_MAILHOG_DASHBOARD_PORT:-8025}:8025'
-        networks:
-            - sail
-    selenium:
-        image: 'selenium/standalone-chrome'
-        volumes:
-            - '/dev/shm:/dev/shm'
-        networks:
-            - sail
 networks:
     sail:
         driver: bridge
 volumes:
-    sail-mysql:
+    sail-mariadb:
         driver: local
     sail-redis:
         driver: local
-    sail-meilisearch:
-        driver: local
diff --git a/phpunit.xml b/phpunit.xml
@@ -21,8 +21,7 @@
         <env name="APP_ENV" value="testing"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
-        <!-- <env name="DB_CONNECTION" value="sqlite"/> -->
-        <!-- <env name="DB_DATABASE" value=":memory:"/> -->
+        <env name="DB_DATABASE" value="testing"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="SESSION_DRIVER" value="array"/>

diff --git a/resources/views/components/list/galaxyhub/basics.blade.php b/resources/views/components/list/galaxyhub/basics.blade.php
@@ -165,7 +165,7 @@
                    {
                        this.interval.list = setInterval(() => {
                            this.post(this.data.list.url, this.data.list.body, success, error, complete)
-                       }, 1000);
+                       }, 10000);
                    }
                }
            },