Merge pull request #109 from uasoft-indonesia/update-seeder

update permission seeder
uasoft-indonesia · Feb 19, 2024 · 9dc30bd · 9dc30bd
2 parents b099927 + 5f00e67
commit 9dc30bd
Show file tree

Hide file tree

Showing 6 changed files with 228 additions and 214 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -78,9 +78,9 @@ jobs:
       - name: Laravel file configuration
         run: git branch &&
           cd laravel &&
-          composer require badaso/core:^2.0 &&
+          composer require badaso/core:^2.0 -W &&
           composer require badaso/content-module:dev-${GITHUB_HEAD_REF} &&
-          composer update --no-interaction
+          composer update --no-interaction -W
 
       # Mysql | Laravel setup
       - name: Mysql | Laravel setup
@@ -117,7 +117,7 @@ jobs:
           php artisan db:wipe &&
           php artisan migrate &&
           php artisan db:seed --class="Database\Seeders\Badaso\BadasoSeeder" &&
-          php artisan db:seed --class="Database\Seeders\Badaso\Content\BadasoContentModuleSeeder" 
+          php artisan db:seed --class="Database\Seeders\Badaso\Content\BadasoContentModuleSeeder"
 
       # Sqlite | Badaso Content Module test
       - name: Sqlite | Badaso Content Module test
@@ -142,8 +142,8 @@ jobs:
           php artisan db:wipe &&
           php artisan migrate &&
           php artisan db:seed --class="Database\Seeders\Badaso\BadasoSeeder" &&
-          php artisan db:seed --class="Database\Seeders\Badaso\Content\BadasoContentModuleSeeder" 
-          
+          php artisan db:seed --class="Database\Seeders\Badaso\Content\BadasoContentModuleSeeder"
+
       # Pgsql | Badaso Content Module test
       - name: Pgsql | Badaso Content Module test
         run: cd laravel && php artisan test
diff --git a/src/Commands/BadasoContentSetup.php b/src/Commands/BadasoContentSetup.php
@@ -58,7 +58,11 @@ private function generateSeeder()
             '--force' => $this->force,
         ]);
 
-        $this->call('l5-swagger:generate');
+        try {
+            $this->call('l5-swagger:generate');
+        } catch (\Exception $e) {
+            //throw $th;
+        }
     }
 
     private function hiddenTableHandle()
@@ -71,7 +75,7 @@ private function hiddenTableHandle()
             $content_config = VarExporter::export($hidden_table);
             $content_config = <<<PHP
             <?php
-            
+
             return {$content_config} ;
             PHP;
 

diff --git a/src/Controllers/ContentController.php b/src/Controllers/ContentController.php
@@ -35,8 +35,8 @@ public function read(Request $request)
             $content = Content::where('id', $request->id)->first();
 
             $data = [
-                'id'    => $content->id,
-                'slug'  => $content->slug,
+                'id' => $content->id,
+                'slug' => $content->slug,
                 'label' => $content->label,
                 'value' => json_decode($content->value),
             ];
@@ -92,7 +92,7 @@ public function add(Request $request)
 
         try {
             $request->validate([
-                'slug'  => 'required|string|unique:Uasoft\Badaso\Module\Content\Models\Content',
+                'slug' => 'required|string|unique:Uasoft\Badaso\Module\Content\Models\Content',
                 'label' => 'required|string',
                 'value' => 'required',
             ]);
@@ -119,8 +119,8 @@ public function edit(Request $request)
 
         try {
             $request->validate([
-                'id'    => 'required|exists:Uasoft\Badaso\Module\Content\Models\Content',
-                'slug'  => 'required|string|exists:Uasoft\Badaso\Module\Content\Models\Content',
+                'id' => 'required|exists:Uasoft\Badaso\Module\Content\Models\Content',
+                'slug' => 'required|string|exists:Uasoft\Badaso\Module\Content\Models\Content',
                 'label' => 'required|string',
                 'value' => 'required',
             ]);
@@ -147,8 +147,8 @@ public function fill(Request $request)
 
         try {
             $request->validate([
-                'id'    => 'required|exists:Uasoft\Badaso\Module\Content\Models\Content,id',
-                'slug'  => 'required|string|exists:Uasoft\Badaso\Module\Content\Models\Content,slug',
+                'id' => 'required|exists:Uasoft\Badaso\Module\Content\Models\Content,id',
+                'slug' => 'required|string|exists:Uasoft\Badaso\Module\Content\Models\Content,slug',
                 'label' => 'required|string',
                 'value' => 'required',
             ]);

diff --git a/src/Seeder/BadasoContentPermissionsSeeder.php b/src/Seeder/BadasoContentPermissionsSeeder.php
@@ -19,8 +19,8 @@ public function run()
         foreach ($keys as $key) {
             Permission::firstOrCreate([
                 'key' => $key,
-                'table_name' => 'content',
                 'description' => 'Fill content',
+                'table_name' => null,
             ]);
         }
 

diff --git a/src/Swagger/content.php b/src/Swagger/content.php
@@ -7,6 +7,7 @@
  *      tags={"content"},
  *      summary="Browse Content",
  *      description="Browse Content",
+ *
  *      @OA\Response(response=200, description="Successful operation"),
  *      @OA\Response(response=400, description="Bad request"),
  *      @OA\Response(response=401, description="Unauthorized"),
@@ -24,14 +25,17 @@
  *      tags={"content"},
  *      summary="Read Content",
  *      description="Read Content",
+ *
  *      @OA\Parameter(
  *          name="id",
  *          required=true,
  *          in="query",
+ *
  *          @OA\Schema(
  *              type="string"
  *          )
  *      ),
+ *
  *      @OA\Response(response=200, description="Successful operation"),
  *      @OA\Response(response=400, description="Bad request"),
  *      @OA\Response(response=401, description="Unauthorized"),
@@ -42,46 +46,52 @@
  * )
  */
 
- /**
-  * @OA\Get(
-  *      path="/module/content/v1/content/fetch",
-  *      operationId="browseModuleContentV1ContentFetch",
-  *      tags={"content"},
-  *      summary="Fetch Content",
-  *      description="Fetch Content",
-  *      @OA\Parameter(
-  *          name="slug",
-  *          required=true,
-  *          in="query",
-  *          @OA\Schema(
-  *              type="string"
-  *          )
-  *      ),
-  *      @OA\Response(response=200, description="Successful operation"),
-  *      @OA\Response(response=400, description="Bad request"),
-  *      @OA\Response(response=401, description="Unauthorized"),
-  *      @OA\Response(response=402, description="Payment Required"),
-  * )
-  */
+/**
+ * @OA\Get(
+ *      path="/module/content/v1/content/fetch",
+ *      operationId="browseModuleContentV1ContentFetch",
+ *      tags={"content"},
+ *      summary="Fetch Content",
+ *      description="Fetch Content",
+ *
+ *      @OA\Parameter(
+ *          name="slug",
+ *          required=true,
+ *          in="query",
+ *
+ *          @OA\Schema(
+ *              type="string"
+ *          )
+ *      ),
+ *
+ *      @OA\Response(response=200, description="Successful operation"),
+ *      @OA\Response(response=400, description="Bad request"),
+ *      @OA\Response(response=401, description="Unauthorized"),
+ *      @OA\Response(response=402, description="Payment Required"),
+ * )
+ */
 
- /**
-  * @OA\Get(
-  *      path="/module/content/v1/content/fetch-multiple",
-  *      operationId="browseModuleContentV1ContentFetchMultiple",
-  *      tags={"content"},
-  *      summary="Fetch Multiple Content",
-  *      description="Fetch Multiple Content",
-  *      @OA\Parameter(
-  *          name="slug",
-  *          required=true,
-  *          in="query",
-  *          @OA\Schema(
-  *              type="string"
-  *          )
-  *      ),
-  *      @OA\Response(response=200, description="Successful operation"),
-  *      @OA\Response(response=400, description="Bad request"),
-  *      @OA\Response(response=401, description="Unauthorized"),
-  *      @OA\Response(response=402, description="Payment Required"),
-  * )
-  */
+/**
+ * @OA\Get(
+ *      path="/module/content/v1/content/fetch-multiple",
+ *      operationId="browseModuleContentV1ContentFetchMultiple",
+ *      tags={"content"},
+ *      summary="Fetch Multiple Content",
+ *      description="Fetch Multiple Content",
+ *
+ *      @OA\Parameter(
+ *          name="slug",
+ *          required=true,
+ *          in="query",
+ *
+ *          @OA\Schema(
+ *              type="string"
+ *          )
+ *      ),
+ *
+ *      @OA\Response(response=200, description="Successful operation"),
+ *      @OA\Response(response=400, description="Bad request"),
+ *      @OA\Response(response=401, description="Unauthorized"),
+ *      @OA\Response(response=402, description="Payment Required"),
+ * )
+ */