Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development

app/Http/Kernel.php

@@ -48,6 +48,7 @@ class Kernel extends HttpKernel
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             // \App\Http\Middleware\WebRouteLogs::class,
             \App\Http\Middleware\WebResponseTimeLog::class,
+            \App\Http\Middleware\LogRequestPathMiddleware::class,
         ],
 
         'api' => [
@@ -55,10 +56,12 @@ class Kernel extends HttpKernel
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             // \App\Http\Middleware\ApiRouteLogs::class,
             \App\Http\Middleware\ApiResponseTimeLog::class,
+            \App\Http\Middleware\LogRequestPathMiddleware::class,
         ],
 
         'apipub' => [
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\LogRequestPathMiddleware::class,
         ],
     ];
 

app/Http/Middleware/LogRequestPathMiddleware.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class LogRequestPathMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $method = $request->method();
+        Log::channel('request_path')->info('Request Method: ' . $method);
+        $fullUrl = $request->fullUrl();
+        Log::channel('request_path')->info('Request URL: ' . $fullUrl);
+
+        if ($request->isMethod('post')) {
+            $payload = $request->all();
+            Log::channel('request_path')->info('Request Payload POST: ', $payload);
+        }
+
+        return $next($request);
+    }
+}

config/logging.php

@@ -135,6 +135,12 @@ return [
             'path' => storage_path('logs/laravel_perfex_crm.log'),
             'level' => 'info',
         ],
+
+        'request_path' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/laravel_request_path.log'),
+            'level' => 'info',
+        ],
         //Custom Log Channels - Ends
 
         //Custom Log Channels - For Laravel Vapor AWS - Starts
@@ -227,6 +233,24 @@ return [
             'level' => 'debug',
             'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX'),
         ],
+
+        'request_path_vapor' => [
+            'driver' => 'custom',
+            'via' => \App\Logging\CloudWatchLoggerFactory::class,
+            'formatter' => Monolog\Formatter\JsonFormatter::class,
+            'cloudwatch_stream_name' => 'request_path_vapor',
+            'sdk' => [
+                'region' => env('AWS_MY_REGION'),
+                'version' => 'latest',
+                'credentials' => [
+                    'key' => env('AWS_CW_ACCESS'),
+                    'secret' => env('AWS_CW_SECRET')
+                ]
+            ],
+            'retention' => 31,
+            'level' => 'debug',
+            'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX'),
+        ],
          //Custom Log Channels - For Laravel Vapor AWS - Ends
     ],
 

package.json

@@ -64,7 +64,7 @@
         "lodash": "^4.17.13",
         "resolve-url-loader": "^3.1.5",
         "vue-loader": "^15.11.1 ",
-        "vue-template-compiler": "^2.7.16"
+        "vue-template-compiler": "^2.7.14"
     },
     "paths": {
         "build": {

resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue

@@ -124,6 +124,7 @@
                                     </list-component>
 
                                     <!-- <list-polling-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list.job')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id, does_not_have_refund_in_progress: true}">
+                                    <list-polling-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list.job')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', is_not_fully_refunded: true, type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
                                         <template slot="list" slot-scope="{data}">
                                             <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
                                         </template>

vapor.yml

@@ -9,7 +9,7 @@ environments:
         queues:
           - exchange-default-production
           - exchange-high_priority-production
-        database: cief-aws-rds-mysql
+        database: cief-amazon-rds-mysql
         storage: exchange-2.0-production
         # gateway-version: 2
         # cache: vapor-laravel-poc-cache
@@ -36,7 +36,7 @@ environments:
         queues:
           - exchange-default-staging
           - exchange-high_priority-staging
-        database: cief-aws-rds-mysql
+        database: cief-amazon-rds-mysql
         storage: exchange-2.0-production-duplicate #cief todo: exchange-2.0-staging
         runtime: 'docker'
         timeout: 180
@@ -54,7 +54,7 @@ environments:
         queues:
           - exchange-default-development
           - exchange-high_priority-development
-        database: cief-aws-rds-mysql
+        database: cief-amazon-rds-mysql
         storage: exchange-2.0-production-duplicate #cief todo: exchange-2.0-develoopment
         runtime: 'docker'
         timeout: 180