docker-compose update

app/Listeners/BusinessUpdateListener.php

@@ -5,6 +5,7 @@ namespace App\Listeners;
 use App\Models\User;
 use App\Models\Business;
 use Illuminate\Support\Arr;
+<<<<<<< Updated upstream
 use App\Channels\FcmChannel;
 use App\Events\BusinessUpdate;
 use App\Events\BusinessUserCreate;
@@ -12,6 +13,14 @@ use App\Notifications\DBNotification;
 use App\Notifications\FcmNotification;
 use App\Notifications\MailNotification;
 use Illuminate\Queue\InteractsWithQueue;
+=======
+use App\Events\BusinessUpdate;
+use App\Events\BusinessUserCreate;
+use App\Notifications\DBNotification;
+use App\Notifications\MailNotification;
+use Illuminate\Queue\InteractsWithQueue;
+
+>>>>>>> Stashed changes
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Facades\Notification;
 
@@ -20,6 +29,7 @@ class BusinessUpdateListener
     public function handle(BusinessUpdate $event)
     {
         $payload = $event->message;
+<<<<<<< Updated upstream
         $business = Business::findOrFail($payload->business)->load('owners');
 
         $this->checkWalletIsRunningLow($business);
@@ -82,6 +92,16 @@ class BusinessUpdateListener
         if ($business->wallet < $threshold) {
             Notification::send($business->owners, new MailNotification($message));
             Notification::send($business->owners, new DBNotification($message));
+=======
+
+        $wallet = $payload?->data?->diff?->wallet;
+        $owners = Business::findOrFail($payload->business)->owners;
+        $message = ['body' => 'Test'];
+
+        if ($wallet < 0) {
+            Notification::send($owners, new MailNotification($message));
+            Notification::send($owners, new DBNotification($message));
+>>>>>>> Stashed changes
         }
     }
 }

app/Models/User.php

@@ -5,6 +5,8 @@ namespace App\Models;
 use App\Models\File;
 use App\Models\Model;
 use App\Models\SoftDeletes;
+use App\Models\ReportableRelation;
+use Illuminate\Notifications\Notifiable;
 use Illuminate\Validation\Rule;
 use Illuminate\Http\UploadedFile;
 use Spatie\MediaLibrary\HasMedia;

app/Providers/EventServiceProvider.php

@@ -45,6 +45,7 @@ class EventServiceProvider extends ServiceProvider
         ProjectUserCreate::class => [
             ProjectUserCreateNotif::class,
         ],
+
         BusinessUpdate::class => [
             BusinessUpdateListener::class,
         ],

composer.lock

@@ -119,16 +119,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.173.23",
+            "version": "3.173.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "259fa1a47a46f81e66b1ea328ed961a58fa061c2"
+                "reference": "69e4653acf8cd855e9010ec4e0e0a7d074c77ee1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/259fa1a47a46f81e66b1ea328ed961a58fa061c2",
-                "reference": "259fa1a47a46f81e66b1ea328ed961a58fa061c2",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/69e4653acf8cd855e9010ec4e0e0a7d074c77ee1",
+                "reference": "69e4653acf8cd855e9010ec4e0e0a7d074c77ee1",
                 "shasum": ""
             },
             "require": {
@@ -203,9 +203,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.173.23"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.173.25"
             },
-            "time": "2021-03-05T19:20:35+00:00"
+            "time": "2021-03-09T19:14:56+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -1313,16 +1313,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v8.31.0",
+            "version": "v8.32.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "2aa5c2488d25178ebc097052c7897a0e463ddc35"
+                "reference": "7c37b64f8153c16b6406f5c28cf37828ebbe8846"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/2aa5c2488d25178ebc097052c7897a0e463ddc35",
-                "reference": "2aa5c2488d25178ebc097052c7897a0e463ddc35",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/7c37b64f8153c16b6406f5c28cf37828ebbe8846",
+                "reference": "7c37b64f8153c16b6406f5c28cf37828ebbe8846",
                 "shasum": ""
             },
             "require": {
@@ -1477,7 +1477,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2021-03-04T15:22:36+00:00"
+            "time": "2021-03-09T15:37:45+00:00"
         },
         {
             "name": "laravel/helpers",
@@ -4094,20 +4094,20 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v6.2.6",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "d2791ff0b73247cdc2096b14f5580aba40c12bff"
+                "reference": "15f7faf8508e04471f666633addacf54c0ab5933"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d2791ff0b73247cdc2096b14f5580aba40c12bff",
-                "reference": "d2791ff0b73247cdc2096b14f5580aba40c12bff",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933",
+                "reference": "15f7faf8508e04471f666633addacf54c0ab5933",
                 "shasum": ""
             },
             "require": {
-                "egulias/email-validator": "^2.0",
+                "egulias/email-validator": "^2.0|^3.1",
                 "php": ">=7.0.0",
                 "symfony/polyfill-iconv": "^1.0",
                 "symfony/polyfill-intl-idn": "^1.10",
@@ -4153,7 +4153,7 @@
             ],
             "support": {
                 "issues": "https://github.com/swiftmailer/swiftmailer/issues",
-                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.6"
+                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -4165,7 +4165,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-05T12:08:49+00:00"
+            "time": "2021-03-09T12:30:35+00:00"
         },
         {
             "name": "symfony/console",
@@ -6627,30 +6627,35 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.9.1",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0 || ^8.0",
+                "php": "^7.2 || ^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
                 "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<3.9.1"
+                "vimeo/psalm": "<4.6.1 || 4.6.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+                "phpunit/phpunit": "^8.5.13"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -6674,9 +6679,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.9.1"
+                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
             },
-            "time": "2020-07-08T17:02:28+00:00"
+            "time": "2021-03-09T10:59:23+00:00"
         }
     ],
     "packages-dev": [
@@ -7183,16 +7188,16 @@
         },
         {
             "name": "laravel/sail",
-            "version": "v1.4.6",
+            "version": "v1.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "59ee7e2b2efeb644eabea719186db91d11666733"
+                "reference": "c57927e1e3919a317034ff706c684f01f15c10d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/59ee7e2b2efeb644eabea719186db91d11666733",
-                "reference": "59ee7e2b2efeb644eabea719186db91d11666733",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/c57927e1e3919a317034ff706c684f01f15c10d8",
+                "reference": "c57927e1e3919a317034ff706c684f01f15c10d8",
                 "shasum": ""
             },
             "require": {
@@ -7239,7 +7244,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2021-03-03T15:22:44+00:00"
+            "time": "2021-03-09T19:15:10+00:00"
         },
         {
             "name": "mockery/mockery",

config/cors.php.bcp

@@ -0,0 +1,34 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cross-Origin Resource Sharing (CORS) Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure your settings for cross-origin resource sharing
+    | or "CORS". This determines what cross-origin operations may execute
+    | in web browsers. You are free to adjust these settings as needed.
+    |
+    | To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+    |
+    */
+
+    'paths' => ['*', 'sanctum/csrf-cookie'],
+
+    'allowed_methods' => ['*'],
+
+    'allowed_origins' => ['*'],
+
+    'allowed_origins_patterns' => ['*'],
+
+    'allowed_headers' => ['*'],
+
+    'exposed_headers' => [],
+
+    'max_age' => 0,
+
+    'supports_credentials' => false,
+
+];

database/seeds/BusinessSeeder.php

@@ -72,6 +72,19 @@ class BusinessSeeder extends Seeder
         Project::insert($projects);
         DB::table('project_user')->insert($project_user);
         DB::table('systems')->insert($systems);
+
+
+        // make sure user with id 1 is owner in one business
+        $user_businesses = DB::table('business_user')->where('user_id', 1)->get();
+        if ($user_businesses->max('level') < enum('roles.manager.id')){
+            $firstRecord = $user_businesses->first();
+            DB::table('business_user')
+                ->where([
+                    'business_id' => $firstRecord->business_id,
+                    'user_id' => $firstRecord->user_id,
+                    'level' => $firstRecord->level,
+                ]) ->update(['level' => enum('roles.manager.id')]);
+        }
         /**
          * Every business has one or more owners, which might be the owner of other business as well
          */

database/seeds/UserSeeder.php

@@ -15,6 +15,6 @@ class UserSeeder extends Seeder
         Fingerprint::insert(
             factory(Fingerprint::class, 5000)->raw()
         );
-        User::where('id', 1)->update(['mobile' => '09123456789']);
+        User::where('id', 1)->update(['email' => 'masouddarvishiv56@gmail.com']);
     }
 }

docker-compose.yml

@@ -12,7 +12,7 @@ services:
         RABBITMQ_DEFAULT_PASS: "root"
         RABBITMQ_DEFAULT_VHOST: "/"
       networks:
-        - sail
+        - hi-user
       volumes:
         - ./definitions.json:/etc/rabbitmq/definitions.json
       depends_on:
@@ -26,7 +26,7 @@ services:
           MINIO_ACCESS_KEY: root
           MINIO_SECRET_KEY: minioroot
         networks:
-          - sail
+          - hi-user
         depends_on:
           - laravel.test
     commander:
@@ -42,9 +42,7 @@ services:
         depends_on:
           - redis
         networks:
-          - sail
-        depends_on:
-          - redis
+          - hi-user
     redis:
         image: redis:latest
         ports:
@@ -53,7 +51,7 @@ services:
         volumes:
           - redis-data:/data
         networks:
-            - sail
+            - hi-user
     laravel.test:
         build:
             context: ./vendor/laravel/sail/runtimes/8.0
@@ -63,13 +61,15 @@ services:
         image: sail-8.0/app
         ports:
             - '${APP_PORT:-80}:80'
+        container_name: "liwo-user-app"
         environment:
             WWWUSER: '${WWWUSER}'
             LARAVEL_SAIL: 1
         volumes:
             - '.:/var/www/html'
         networks:
-            - sail
+            - hi-user
+            - hi
         depends_on:
             - mysql
     mysql:
@@ -85,7 +85,7 @@ services:
         volumes:
             - 'sailmysql:/var/lib/mysql'
         networks:
-            - sail
+            - hi-user
         healthcheck:
           test: ["CMD", "mysqladmin", "ping"]
     pma:
@@ -99,7 +99,7 @@ services:
       depends_on:
         - mysql
       networks:
-        - sail
+        - hi-user
     mailhog:
       image: mailhog/mailhog
       logging:
@@ -108,10 +108,12 @@ services:
         - 1025:1025 # smtp server
         - 8025:8025 # web ui
       networks:
-        - sail
+        - hi-user
 networks:
-    sail:
-        driver: bridge
+  hi-user:
+    external: false
+  hi:
+    external: true
 volumes:
     redis-data:
         driver: local