bug azienda

app/Http/Controllers/LoginController.php

@@ -43,6 +43,7 @@ class LoginController extends Controller
         if($user == null){
           $user = new User;
           $user->redmine_id = $redmineUser->id;
+          $user->azienda()->associate($azienda);
           $user->save();
         }
 

app/Models/AbstractModels/AbstractAzienda.php

@@ -57,4 +57,14 @@ abstract class AbstractAzienda extends Model
         'created_at',
         'updated_at'
     ];
+    
+    public function configs()
+    {
+        return $this->hasMany('\App\Models\Config', 'azienda_id', 'id');
+    }
+    
+    public function users()
+    {
+        return $this->hasMany('\App\Models\User', 'azienda_id', 'id');
+    }
 }

app/Models/AbstractModels/AbstractConfig.php

@@ -17,26 +17,12 @@ abstract class AbstractConfig extends Model
      */
     protected $table = 'config';
     
-    /**  
-     * Primary key name.
-     * 
-     * @var string
-     */
-    public $primaryKey = 'key';
-    
     /**  
      * Primary key type.
      * 
      * @var string
      */
-    protected $keyType = 'string';
-    
-    /**  
-     * Primary key is non-autoincrementing.
-     * 
-     * @var bool
-     */
-    public $incrementing = false;
+    protected $keyType = 'bigInteger';
     
     /**  
      * The attributes that should be cast to native types.
@@ -44,6 +30,8 @@ abstract class AbstractConfig extends Model
      * @var array
      */
     protected $casts = [
+        'id' => 'integer',
+        'azienda_id' => 'integer',
         'key' => 'string',
         'group' => 'string',
         'display_name' => 'string',
@@ -60,6 +48,8 @@ abstract class AbstractConfig extends Model
      * @var array
      */
     protected $fillable = [
+        'id',
+        'azienda_id',
         'key',
         'group',
         'display_name',
@@ -69,4 +59,9 @@ abstract class AbstractConfig extends Model
         'created_at',
         'updated_at'
     ];
+    
+    public function azienda()
+    {
+        return $this->belongsTo('\App\Models\Azienda', 'azienda_id', 'id');
+    }
 }

app/Models/AbstractModels/AbstractUser.php

@@ -32,6 +32,7 @@ abstract class AbstractUser extends Model
     protected $casts = [
         'id' => 'integer',
         'redmine_id' => 'integer',
+        'azienda_id' => 'integer',
         'firma' => 'string',
         'created_at' => 'datetime',
         'updated_at' => 'datetime'
@@ -45,8 +46,14 @@ abstract class AbstractUser extends Model
     protected $fillable = [
         'id',
         'redmine_id',
+        'azienda_id',
         'firma',
         'created_at',
         'updated_at'
     ];
+    
+    public function azienda()
+    {
+        return $this->belongsTo('\App\Models\Azienda', 'azienda_id', 'id');
+    }
 }

app/Models/Config.php

@@ -18,7 +18,7 @@ class Config extends \App\Models\AbstractModels\AbstractConfig
 
   public static function getValue($key){
     try{
-      return Config::find($key)->value;
+      return Config::where([['key', $key], ['azienda_id', session('azienda')->id]])->first()->value;
     }catch(\Exception $e){
       return 0;
     }

app/Models/Issue.php

@@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Log;
 
 class Issue{
 
-  public static function getCollection(array $status = []){
+  public static function getCollection($status = []){
     $redmineUser = session('redmine_user');
     $collection = new Collection();
 
@@ -16,7 +16,7 @@ class Issue{
     $issueResponse = Http::get(session('azienda')->redmine_url.'/issues.json', [
       'key' => $redmineUser->api_key,
       'assigned_to_id' => $redmineUser->id,
-      'status_id' => count($status)>0?implode('|', $status):'open',
+      'status_id' => ($status!=null && count($status)>0)?implode('|', $status):'open',
       'limit' => 100,
     ]);
 
@@ -40,6 +40,7 @@ class Issue{
         $issueResponse = Http::get(session('azienda')->redmine_url.'/issues.json', [
           'key' => $redmineUser->api_key,
           'assigned_to_id' => $group->id,
+          'status_id' => ($status!=null && count($status)>0)?implode('|', $status):'open',
           'limit' => 100,
         ]);
 

database/migrations/2022_03_18_100151_skipper_migrations_2022031810015198.php

@@ -1,42 +0,0 @@
-<?php
-/* 
- * Migrations generated by: Skipper (http://www.skipper18.com)
- * Migration id: 389c4dec-5f41-4008-a12d-91fe5ebf4b24
- * Migration datetime: 2022-03-18 10:01:51.987239
- */ 
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class SkipperMigrations2022031810015198 extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('config', function (Blueprint $table) {
-            $table->string('key');
-            $table->string('group')->nullable(true);
-            $table->string('display_name')->nullable(true);
-            $table->longText('value')->nullable(true);
-            $table->integer('order')->nullable(true);
-            $table->string('type')->nullable(true);
-            $table->timestamp('created_at')->nullable(true);
-            $table->timestamp('updated_at')->nullable(true);
-            $table->primary(['key']);
-        });
-    }
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('config');
-    }
-}

database/migrations/2022_03_18_104703_skipper_migrations_2022031810470316.php

@@ -1,38 +0,0 @@
-<?php
-/* 
- * Migrations generated by: Skipper (http://www.skipper18.com)
- * Migration id: 81cb22a4-03b7-4566-9925-9af06de59d8c
- * Migration datetime: 2022-03-18 10:47:03.168319
- */ 
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class SkipperMigrations2022031810470316 extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('user', function (Blueprint $table) {
-            $table->bigInteger('id')->autoIncrement()->unsigned();
-            $table->integer('redmine_id')->nullable(true);
-            $table->text('firma')->nullable(true);
-            $table->timestamp('created_at')->nullable(true);
-            $table->timestamp('updated_at')->nullable(true);
-        });
-    }
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('user');
-    }
-}

database/migrations/2022_03_18_122155_skipper_migrations_2022031812215528.php

@@ -1,36 +0,0 @@
-<?php
-/* 
- * Migrations generated by: Skipper (http://www.skipper18.com)
- * Migration id: 4e7662d1-1f4b-45d7-9b1e-50073955d166
- * Migration datetime: 2022-03-18 12:21:55.286492
- */ 
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class SkipperMigrations2022031812215528 extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('user', function (Blueprint $table) {
-            $table->binary('firma')->nullable(true)->after('redmine_id')->change();
-        });
-    }
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('user', function (Blueprint $table) {
-            $table->text('firma')->nullable(true)->after('redmine_id')->change();
-        });
-    }
-}

database/migrations/2022_03_18_142224_skipper_migrations_2022031814222440.php

@@ -0,0 +1,68 @@
+<?php
+/* 
+ * Migrations generated by: Skipper (http://www.skipper18.com)
+ * Migration id: 46c0a901-82c6-46b0-b5b2-c384b35596e4
+ * Migration datetime: 2022-03-18 14:22:24.400151
+ */ 
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class SkipperMigrations2022031814222440 extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('config', function (Blueprint $table) {
+            $table->bigInteger('id')->autoIncrement()->unsigned();
+            $table->bigInteger('azienda_id')->nullable(true)->unsigned();
+            $table->string('key')->nullable(true);
+            $table->string('group')->nullable(true);
+            $table->string('display_name')->nullable(true);
+            $table->longText('value')->nullable(true);
+            $table->integer('order')->nullable(true);
+            $table->string('type')->nullable(true);
+            $table->timestamp('created_at')->nullable(true);
+            $table->timestamp('updated_at')->nullable(true);
+        });
+        Schema::create('user', function (Blueprint $table) {
+            $table->bigInteger('id')->autoIncrement()->unsigned();
+            $table->integer('redmine_id')->nullable(true);
+            $table->bigInteger('azienda_id')->nullable(true)->unsigned();
+            $table->binary('firma')->nullable(true);
+            $table->timestamp('created_at')->nullable(true);
+            $table->timestamp('updated_at')->nullable(true);
+        });
+        Schema::table('config', function (Blueprint $table) {
+            $table->foreign('azienda_id')->references('id')->on('azienda')->onDelete('cascade');
+        });
+        Schema::table('user', function (Blueprint $table) {
+            $table->foreign('azienda_id')->references('id')->on('azienda')->onDelete('cascade');
+        });
+    }
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        if (Schema::hasTable('user')) {
+            Schema::table('user', function (Blueprint $table) {
+                $table->dropForeign(['azienda_id']);
+            });
+        }
+        if (Schema::hasTable('config')) {
+            Schema::table('config', function (Blueprint $table) {
+                $table->dropForeign(['azienda_id']);
+            });
+        }
+        Schema::dropIfExists('user');
+        Schema::dropIfExists('config');
+    }
+}

database/seeders/ConfigSeeder.php

@@ -4,6 +4,7 @@ namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
 use App\Models\Config;
+use App\Models\Azienda;
 
 class ConfigSeeder extends Seeder
 {
@@ -15,17 +16,21 @@ class ConfigSeeder extends Seeder
   public function run()
   {
     // Configurazione
-    foreach(Config::getConfig() as $key => $group){
-      $order = 1;
-      foreach($group as $key2 => $c){
-        $config = Config::find($c['key']);
-        if($config == null){
-          $config = new Config;
-          $config->fill($c);
-          $config->order = $order;
-          $config->group = $key;
-          $config->save();
-          $order++;
+    foreach(Azienda::all() as $azienda){
+      foreach(Config::getConfig() as $key => $group){
+        $order = 1;
+        foreach($group as $key2 => $c){
+          $config = Config::where([['key', $c['key']], ['azienda_id', $azienda->id]])->first();
+          if($config == null){
+            $config = new Config;
+            $config->fill($c);
+            $config->order = $order;
+            $config->group = $key;
+            $config->key = $c['key'];
+            $config->azienda()->associate($azienda);
+            $config->save();
+            $order++;
+          }
         }
       }
     }

resources/views/config/index.blade.php

@@ -36,26 +36,26 @@ thead select{
           @foreach(Config::groupBy('group')->pluck('group')->toarray() as $group)
 
           <h2 style="margin-top: 20px;">{{ $group }}</h2>
-          @foreach(Config::where('group', $group)->orderBy('order', 'ASC')->get() as $config)
+          @foreach(Config::where([['group', $group], ['azienda_id', session('azienda')->id]])->orderBy('order', 'ASC')->get() as $config)
 
           <div class="form-row">
             <div class="form-group col">
-              {!! Form::hidden('key['.$config->key.']', $config->key) !!}
-              {!! Form::label('key['.$config->key.']', $config->display_name) !!}
+              {!! Form::hidden('key['.$config->id.']', $config->id) !!}
+              {!! Form::label('key['.$config->id.']', $config->display_name) !!}
               @switch($config->type)
               @case('boolean')
               <br>
-              {!! Form::radio('value['.$config->key.']', 1, $config->value==true, ['class' => '']) !!} SI
-              {!! Form::radio('value['.$config->key.']', 0, $config->value==false, ['class' => '']) !!} NO
+              {!! Form::radio('value['.$config->id.']', 1, $config->value==true, ['class' => '']) !!} SI
+              {!! Form::radio('value['.$config->id.']', 0, $config->value==false, ['class' => '']) !!} NO
               @break
 
               @case('textarea')
               <br>
-              {!! Form::textarea('value['.$config->key.']', $config->value, ['class' => 'form-control']) !!}
+              {!! Form::textarea('value['.$config->id.']', $config->value, ['class' => 'form-control']) !!}
               @break
 
               @case('password')
-              {!! Form::password('value['.$config->key.']', ['class' => 'form-control']) !!}
+              {!! Form::password('value['.$config->id.']', ['class' => 'form-control']) !!}
               @break
 
               @case('array_status')
@@ -63,7 +63,7 @@ thead select{
               <?php
               $checked = json_decode($config->value);
               foreach(Issue::getStati() as $status_id => $status_label){
-                echo Form::checkbox('value['.$config->key.'][]', $status_id, $checked!=null?in_array($status_id, $checked):false, [])." ".$status_label."<br>";
+                echo Form::checkbox('value['.$config->id.'][]', $status_id, $checked!=null?in_array($status_id, $checked):false, [])." ".$status_label."<br>";
               }
               ?>
               @break
@@ -71,7 +71,7 @@ thead select{
               @case('file')
               <div class="form-row">
                 <div class="form-group col">
-                  {!! Form::file('value['.$config->key.']', null, ['class' => 'form-control']) !!}
+                  {!! Form::file('value['.$config->id.']', null, ['class' => 'form-control']) !!}
                 </div>
                 <div class="form-group col">
                   <p>Logo attuale</p>
@@ -85,7 +85,7 @@ thead select{
               @break
 
               @default
-              {!! Form::text('value['.$config->key.']', $config->value, ['class' => 'form-control']) !!}
+              {!! Form::text('value['.$config->id.']', $config->value, ['class' => 'form-control']) !!}
               @endswitch
             </div>
           </div>