Merge remote-tracking branch 'origin/master' into 49-add-migration-generator-tests

Author: pirs1337

composer.lock

@@ -238,7 +238,6 @@ protected function buildRelationsTree($models): array
     protected function canGenerateUserData(): bool
     {
         return $this->classExists('models', 'User')
-            && $this->isFactoryExists('User')
             && $this->isMethodExists('User', 'getFields');
     }
 

src/Generators/AbstractTestsGenerator.php

@@ -17,7 +17,6 @@ public function generate(): void
                 "Cannot create {$this->model}Controller cause {$this->model}Controller already exists.",
                 "Remove {$this->model}Controller.",
             );
-
         }
 
         if (!$this->classExists('services', "{$this->model}Service")) {
@@ -45,7 +44,7 @@ protected function getControllerContent($model): string
     {
         return $this->getStub('controller', [
             'entity' => $model,
-            'requestsFolder' => $this->getPluralName($model),
+            'requestsFolder' => $model,
             'namespace' => $this->getOrCreateNamespace('controllers'),
             'requestsNamespace' => $this->getOrCreateNamespace('requests'),
             'resourcesNamespace' => $this->getOrCreateNamespace('resources'),

src/Generators/ControllerGenerator.php

@@ -67,7 +67,7 @@ public function generate(): void
 
     protected function createRequest($method, $needToValidate = true, $parameters = []): void
     {
-        $requestsFolder = $this->getPluralName($this->model);
+        $requestsFolder = $this->model;
         $modelName = $this->getEntityName($method);
 
         $content = $this->getStub('request', [

src/Generators/RequestsGenerator.php

@@ -36,7 +36,7 @@ public function generateCollectionResource(): void
             'namespace' => $this->getOrCreateNamespace('resources')
         ]);
 
-        $this->saveClass('resources', "{$pluralName}CollectionResource", $collectionResourceContent);
+        $this->saveClass('resources', "{$pluralName}CollectionResource", $collectionResourceContent, $this->model);
 
         event(new SuccessCreateMessage("Created a new CollectionResource: {$pluralName}CollectionResource"));
     }
@@ -57,8 +57,8 @@ public function generateResource(): void
             'model_namespace' => $this->getOrCreateNamespace('models'),
         ]);
 
-        $this->saveClass('resources', "{$this->model}Resource", $resourceContent);
+        $this->saveClass('resources', "{$this->model}Resource", $resourceContent, $this->model);
 
         event(new SuccessCreateMessage("Created a new Resource: {$this->model}Resource"));
     }
-}
+}

src/Generators/ResourceGenerator.php

@@ -1,8 +1,8 @@
-namespace {{$namespace}};
+namespace {{$namespace}}\{{$singular_name}};
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
 class {{$plural_name}}CollectionResource extends ResourceCollection
 {
     public $collects = {{$singular_name}}Resource::class;
-}
+}

stubs/collection_resource.blade.php

@@ -1,7 +1,7 @@
 namespace {{$namespace}};
 
 @inject('str', 'Illuminate\Support\Str')
-use {{$resourcesNamespace}}\{{$str::plural($entity)}}CollectionResource;
+use {{$resourcesNamespace}}\{{$entity}}\{{$str::plural($entity)}}CollectionResource;
 @if (in_array('C', $options))
 use {{$requestsNamespace}}\{{$requestsFolder}}\Create{{$entity}}Request;
 @endif
@@ -15,12 +15,12 @@
 @if (in_array('U', $options))
 use {{$requestsNamespace}}\{{$requestsFolder}}\Update{{$entity}}Request;
 @endif
-use {{$resourcesNamespace}}\{{$entity}}Resource;
+use {{$resourcesNamespace}}\{{$entity}}\{{$entity}}Resource;
 use {{$servicesNamespace}}\{{$entity}}Service;
 @if (in_array('D', $options) || in_array('U', $options))
 use Symfony\Component\HttpFoundation\Response;
-
 @endif
+
 class {{$entity}}Controller extends Controller
 {
 @if (in_array('C', $options))
@@ -70,4 +70,4 @@ public function delete(Delete{{$entity}}Request $request, {{$entity}}Service $se
         return response('', Response::HTTP_NO_CONTENT);
     }
 @endif
-}
+}

stubs/controller.blade.php

@@ -6,7 +6,7 @@
 
 class {{$entity}} extends Model
 {
-    use ModelTrait, HasFactory;
+    use HasFactory, ModelTrait;
 
     protected $fillable = [
 @foreach($fields as $field)

stubs/model.blade.php

@@ -1,4 +1,4 @@
-namespace {{$namespace}};
+namespace {{$namespace}}\{{$entity}};
 
 use Illuminate\Http\Resources\Json\JsonResource;
 use {{$model_namespace}}\{{$entity}};
@@ -8,9 +8,11 @@
  */
 class {{$entity}}Resource extends JsonResource
 {
+    public static $wrap = null;
+
     //TODO implement custom serialization logic or remove method redefining
     public function toArray($request): array
     {
         return parent::toArray($request);
     }
-}
+}

stubs/resource.blade.php

@@ -21,7 +21,7 @@ class {{$entity}}Test extends TestCase
     protected static ModelTestState ${{\Illuminate\Support\Str::camel($entity)}}State;
 
 @endif
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 @if ($withAuth)
@@ -47,7 +47,8 @@ public function testCreate()
 
         $response->assertCreated();
 
-        $this->assertEqualsFixture('create_{{\Illuminate\Support\Str::snake($entity)}}_response.json', $response->json());
+        // TODO: Need to remove last argument after first successful start
+        $this->assertEqualsFixture('create_{{\Illuminate\Support\Str::snake($entity)}}_response.json', $response->json(), true);
 
         // TODO: Need to remove last argument after first successful start
         self::${{\Illuminate\Support\Str::camel($entity)}}State->assertChangesEqualsFixture('create_{{\Illuminate\Support\Str::snake($entity)}}_state.json', true);
@@ -93,6 +94,8 @@ public function testUpdateNotExists()
 @endif
 
         $response->assertNotFound();
+
+        self::${{\Illuminate\Support\Str::camel($entity)}}State->assertNotChanged();
     }
 
 @if ($withAuth)
@@ -103,6 +106,8 @@ public function testUpdateNoAuth()
         $response = $this->json('put', '/{{$entities}}/1', $data);
 
         $response->assertUnauthorized();
+
+        self::${{\Illuminate\Support\Str::camel($entity)}}State->assertNotChanged();
     }
 
 @endif
@@ -172,6 +177,15 @@ public function testGetNotExists()
 
         $response->assertNotFound();
     }
+@if ($withAuth)
+
+    public function testGetNoAuth()
+    {
+        $response = $this->json('get', '/{{$entities}}/1');
+
+        $response->assertUnauthorized();
+    }
+@endif
 
     public static function getSearchFilters(): array
     {
@@ -193,7 +207,7 @@ public static function getSearchFilters(): array
     #[DataProvider('getSearchFilters')]
     public function testSearch(array $filter, string $fixture)
     {
-        $response = $this->json('get', '/{{$entities}}', $filter);
+        $response = $this->actingAs(self::$user)->json('get', '/{{$entities}}', $filter);
 
         $response->assertOk();
 
@@ -202,5 +216,14 @@ public function testSearch(array $filter, string $fixture)
 
         $this->assertEqualsFixture($fixture, $response->json());
     }
+
+@if ($withAuth)
+    public function testSearchNoAuth()
+    {
+        $response = $this->json('get', '/{{$entities}}');
+
+        $response->assertUnauthorized();
+    }
+@endif
 @endif
 }