Fix some error console

.env.example

@@ -1,49 +1,35 @@
 APP_NAME=Laravel
 APP_ENV=local
-APP_KEY=base64:RiWBp49nfpfayJpARxkxdBXKRSrLnVDvq3UjAuW4qWQ=
+APP_KEY=
 APP_DEBUG=true
 APP_URL=http://127.0.0.1:8000
 
 LOG_CHANNEL=stack
 LOG_LEVEL=debug
 
 # docker
-# DB_CONNECTION="pgsql"
-# DB_HOST=mediumdb
-# DB_PORT=5432
-# DB_DATABASE=medium
-# DB_USERNAME="dani"
-# DB_PASSWORD="password"
-
-# mysql
-DB_CONNECTION="mysql"
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=blog
-DB_USERNAME="daniel"
-DB_PASSWORD="Password123#@!"
-
-BROADCAST_DRIVER=log
+DB_CONNECTION="pgsql"
+DB_HOST=redact_db
+DB_PORT=5432
+DB_DATABASE=postgres
+DB_USERNAME="dani"
+DB_PASSWORD="password"
+
+BROADCAST_DRIVER=pusher
 CACHE_DRIVER=redis
-FILESYSTEM_DRIVER=local
-QUEUE_CONNECTION=redis
-# SESSION_DRIVER=file
-# SESSION_LIFETIME=120
+FILESYSTEM_DRIVER=minio
+QUEUE_CONNECTION=rabbitmq
 
-# REDIS_HOST=redis
-# REDIS_PASSWORD=
-# REDIS_PORT=6379
-
-REDIS_HOST=mediumredis
+REDIS_HOST="redact_cache"
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_MAILER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
-MAIL_USERNAME=3e3ff464db3fda
-MAIL_PASSWORD=aec248ea70249a
-MAIL_ENCRYPTION=tls
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_ENCRYPTION=
 
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
@@ -54,7 +40,21 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+SCOUT_DRIVER="elastic"
+SCOUT_QUEUE=true
+
+ELASTIC_HOST="redact_elastic"
+RABBITMQ_HOST="redact_rabbitmq"
+
+CUSTOM_ELASTIC_IP=172.19.0.30
+CUSTOM_KIBANA_IP=172.19.0.40
+CUSTOM_MINIO_IP=172.19.0.20
+SUBNET=172.19.0.0/16

.env.example.ci

@@ -1,19 +1,19 @@
-APP_NAME=Laravel
-APP_ENV=local
+APP_NAME=redact
+APP_ENV=staging
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://localhost
+APP_URL=http://127.0.0.1
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=laravel
+DB_PORT=33306
+DB_DATABASE=db_test
 DB_USERNAME=root
-DB_PASSWORD=
+DB_PASSWORD=password
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -57,3 +57,4 @@ VITE_PUSHER_PORT="${PUSHER_PORT}"
 VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
 VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
+ELASTIC_HOST="localhost"

.github/workflows/tests.yml

@@ -1,11 +1,22 @@
 name: Tests
-
 on: [ push, pull_request ]
-
 jobs:
-  laravel-blog:
+  redact:
     runs-on: ubuntu-latest
     services:
+      elasticsearch:
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0
+        env:
+          discovery.type: single-node
+        options: >-
+          --name mediumElasticsearch
+          --hostname mediumElasticsearch
+          --health-cmd "curl http://localhost:9200/_cluster/health"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+        ports:
+          - 9200:9200
       mysql-service:
         image: mysql:5.7
         env:
@@ -18,25 +29,35 @@ jobs:
           --health-interval=10s
           --health-timeout=5s
           --health-retries=3
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+      - name: Verify Elasticsearch connection from host
+        env:
+          ELASTIC_SEARCH_URL: http://localhost:${{ job.services.elasticsearch.ports[9200] }}
+        run: |
+          echo $ELASTIC_SEARCH_URL
+          curl -fsSL "$ELASTIC_SEARCH_URL/_cat/health?h=status"
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.1
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite
           coverage: none
-
       - name: Install Composer dependencies
         run: composer install --prefer-dist --no-interaction
-
       - name: Copy environment file
         run: cp .env.example.ci .env
-
       - name: Generate app key
         run: php artisan key:generate
+      - name: Optimization
+        run: php artisan optimize:clear
+      - name: Migration
+        run: php artisan migrate:fresh --seed
+      - name: Import indexes
+        run: php artisan scout:index posts
+      - name: Import db
+        run: php artisan scout:import "Module\Post\Models\Post"
       - name: Execute tests (Unit and Feature tests) via PHPUnit
         env:
           DB_CONNECTION: mysql
@@ -46,3 +67,5 @@ jobs:
           DB_PASSWORD: password
         run:
           php artisan test
+#      - name: Run php stan
+#        run: ./vendor/bin/phpstan analyse --memory-limit=2G

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Daniel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Modules/Auth/Http/Controllers/v1/AuthController.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Module\Auth\Http\Controllers\v1;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Http\Response;
+use Illuminate\Support\Collection;
+use Module\Auth\Http\Requests\v1\LoginRequest;
+use Module\Auth\Http\Requests\v1\RegisterRequest;
+use Module\Auth\Services\v1\AuthService;
+use Module\Share\Contracts\Response\ResponseGenerator;
+use Module\User\Http\Resources\v1\UserResource;
+
+class AuthController extends Controller implements ResponseGenerator
+{
+    private AuthService $service;
+
+    public function __construct()
+    {
+        $this->service = resolve(AuthService::class);
+    }
+
+    /**
+     * Register user
+     *
+     * @param  RegisterRequest  $request
+     * @return JsonResponse $this->response($status,$message,$data)
+     */
+    public function register(RegisterRequest $request)
+    {
+        $res = $this->service->store($request);
+
+        // verification by mail
+        event(new Registered($res['user']));
+
+        return $this->res('success', Response::HTTP_CREATED, 'Successfully register', $res);
+    }
+
+    /**
+     * Login user
+     *
+     * @param  LoginRequest  $request
+     * @return JsonResponse $this->response($status,$message,$data)
+     */
+    public function login(LoginRequest $request)
+    {
+        $res = $this->service->login($request);
+
+        return $this->res($res[0], $res[1], $res[2], $res[3]);
+    }
+
+    public function res(string $status, int $code, string|null $message, array|int|ResourceCollection|JsonResource $data = null): JsonResponse
+    {
+        return response()->json([
+            'status' => $status,
+            'message' => $message,
+            'data' => ! $data ? null : [
+                'user' => new UserResource($data['user']),
+                'token' => $data['token'],
+            ],
+        ], $code);
+    }
+}

Modules/Auth/Http/Controllers/v1/VerifyController.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Module\Auth\Http\Controllers\v1;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\EmailVerificationRequest;
+use Illuminate\Http\Request;
+
+class VerifyController extends Controller
+{
+    /**
+     * @param  EmailVerificationRequest  $request
+     * @return string
+     */
+    public function verify(EmailVerificationRequest $request)
+    {
+        $request->fulfill();
+
+        return 'ok,verify it';
+    }
+
+    /**
+     * @param Request $request
+     * @return mixed
+     */
+    public function send(Request $request)
+    {
+        return null;
+        /*$request->user()->sendEmailVerificationNotification();
+
+        return 'send it';*/
+    }
+}

Modules/User/Http/Controllers/auth/v2/AuthController.php → Modules/Auth/Http/Controllers/v2/AuthController.php

@@ -1,44 +1,45 @@
 <?php
 
-namespace Module\User\Http\Controllers\auth\v2;
+namespace Module\Auth\Http\Controllers\v2;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Auth\Events\Registered;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Support\Collection;
+use Module\Auth\Http\Requests\v2\LoginRequest;
+use Module\Auth\Http\Requests\v2\RegisterRequest;
+use Module\Auth\Services\v2\AuthService;
 use Module\Share\Contracts\Response\ResponseGenerator;
-use Module\User\Http\Requests\v2\LoginRequest;
-use Module\User\Http\Requests\v2\RegisterRequest;
 use Module\User\Http\Resources\v2\UserResource;
-use Module\User\Services\v2\UserService;
 
 class AuthController extends Controller implements ResponseGenerator
 {
-    private $service;
+    private AuthService $service;
 
     public function __construct()
     {
-        $this->service = resolve(UserService::class);
+        $this->service = resolve(AuthService::class);
     }
 
     /**
      * Register user
-     * @param \Module\User\Http\Requests\v2\RegisterRequest $request
-     * @return \Illuminate\Http\JsonResponse
+     *
+     * @param RegisterRequest $request
+     * @return JsonResponse
      */
     public function register(RegisterRequest $request)
     {
         $store = $this->service->store($request);
 
-        event(new Registered($store['data']['user']));
-
         return $this->res($store['status'], $store['code'], $store['message'], $store['data']);
     }
 
     /**
      * Login user
-     * @param \Module\User\Http\Requests\v2\LoginRequest $request
-     * @return \Illuminate\Http\JsonResponse $this->response($status,$message,$data)
+     *
+     * @param LoginRequest $request
+     * @return JsonResponse $this->response($status,$message,$data)
      */
     public function login(LoginRequest $request): \Illuminate\Http\JsonResponse
     {
@@ -47,15 +48,15 @@ public function login(LoginRequest $request): \Illuminate\Http\JsonResponse
         return $this->res($login['status'], $login['code'], $login['message'], $login['data']);
     }
 
-    public function res($status, $code, $message, $data = null): \Illuminate\Http\JsonResponse
+    public function res(string $status, int $code, string|null $message, array|int|ResourceCollection|JsonResource $data = null): JsonResponse
     {
         return response()->json([
             'status' => $status,
             'message' => $message,
-            'data' => !$data ? null : [
+            'data' => ! $data ? null : [
                 'user' => new UserResource($data['user']),
-                'token' => $data['token']
-            ]
+                'token' => $data['token'],
+            ],
         ], $code);
     }
 }