Merge pull request #9 from soap/develop

Update database loader and workflow loader

Author: soap

src/Repositories/WorkflowRepository.php

@@ -16,10 +16,12 @@ public function __construct(Workflow $model)
     public function all()
     {
         $workflows = $this->model->with(['transitions', 'states'])->get();
+        $config = collect([]);
+        foreach ($workflows as $workflow) {
+            $config = $config->merge($this->makeWorkflowCofig($workflow));
+        }
 
-        return $workflows->map(function ($workflow) {
-            return $this->makeWorkflowCofig($workflow);
-        })->toArray();
+        return $config->toArray();
     }
 
     public function find($id)

src/WorkflowLoader.php

@@ -31,8 +31,11 @@ public function all(): array
             return [];
         }
 
-        return collect($this->loaders)->mapWithKeys(function ($loader) {
-            return [$loader::class => $loader->all()];
-        })->toArray();
+        $workflows = collect([]);
+        foreach ($this->loaders as $loader) {
+            $workflows = $workflows->merge(collect($loader->all()));
+        }
+
+        return $workflows->toArray();
     }
 }