fix: all but 2 tests

PThorpe92 · PThorpe92 · commit 85c79b25ad5e · 2023-11-08T22:26:57.000-05:00
diff --git a/app/Http/Controllers/Api/V1/ProviderPlatformController.php b/app/Http/Controllers/Api/V1/ProviderPlatformController.php
@@ -28,7 +28,8 @@ public function index()
     // ****************************************************
     public function show(string $id): ProviderPlatformResource|\Illuminate\Http\JsonResponse
     {
-        $providerPlatform = ProviderPlatform::where('id', $id)->first();
+        $providerPlatform = ProviderPlatform::where('id', $id)->get()->first();
+
         if ($providerPlatform) {
             return ProviderPlatformResource::make($providerPlatform);
         } else {
diff --git a/app/Http/Controllers/Api/V1/StudentEnrollmentController.php b/app/Http/Controllers/Api/V1/StudentEnrollmentController.php
@@ -20,9 +20,10 @@ class StudentEnrollmentController extends Controller
     // ****************************************************
     public function show(string $id)
     {
-        $mapping = StudentMapping::where('student_id', $id)->get();
+        $mapping = StudentMapping::where('consumer_user_id', $id)->get();
+
         $enrollments = StudentEnrollment::where('provider_user_id', $mapping->provider_user_id)
-            ->where('provider_platform_id', $mapping->provider_platform_id)->where('status', 'in_progress')->all();
+            ->where('provider_platform_id', $mapping->provider_platform_id)->all();
 
         return StudentEnrollmentResource::collection($enrollments);
     }
diff --git a/database/factories/PlatformConnectionFactory.php b/database/factories/PlatformConnectionFactory.php
@@ -2,6 +2,8 @@
 
 namespace Database\Factories;
 
+use App\Models\ConsumerPlatform;
+use App\Models\ProviderPlatform;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
@@ -17,8 +19,8 @@ class PlatformConnectionFactory extends Factory
     public function definition(): array
     {
         return [
-            'consumer_platform_id' => $this->faker->numberBetween(1, 10),
-            'provider_platform_id' => $this->faker->numberBetween(1, 10),
+            'consumer_platform_id' => ConsumerPlatform::factory()->create()->id,
+            'provider_platform_id' => ProviderPlatform::factory()->create()->id,
             'state' => 'enabled',
         ];
     }
diff --git a/database/factories/StudentEnrollmentFactory.php b/database/factories/StudentEnrollmentFactory.php
@@ -2,6 +2,8 @@
 
 namespace Database\Factories;
 
+use App\Models\ProviderPlatform;
+use App\Models\StudentMapping;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
@@ -21,9 +23,9 @@ class StudentEnrollmentFactory extends Factory
     public function definition(): array
     {
         return [
-            "provider_user_id" => $this->faker->randomDigitNotNull,              // Student ID in our system (maps to appropriate ID)
+            "provider_user_id" =>  StudentMapping::factory()->create()->provider_user_id,              // Student ID in our system (maps to appropriate ID)
             "provider_content_id" => $this->faker->randomDigitNotNull,           // Course ID
-            "provider_platform_id" => $this->faker->randomDigitNotNull,
+            "provider_platform_id" => ProviderPlatform::factory()->create()->id,
             "status" => "enabled",                        // Enum (ProviderUserResourceStatus)
         ];
     }
diff --git a/database/factories/StudentFactory.php b/database/factories/StudentFactory.php
@@ -2,6 +2,7 @@
 
 namespace Database\Factories;
 
+use App\Models\Student;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
@@ -17,7 +18,7 @@ class StudentFactory extends Factory
     public function definition(): array
     {
         return [
-            'id' => $this->faker->uuid(),
+            'id' => Student::factory()->create()->id,
         ];
     }
 }
diff --git a/database/factories/StudentMappingFactory.php b/database/factories/StudentMappingFactory.php
@@ -15,13 +15,14 @@ class StudentMappingFactory extends Factory
 {
     public function definition()
     {
-        DB::statement('PRAGMA foreign_keys = 0');
+        $prov = ProviderPlatform::factory()->create();
+        $con = ConsumerPlatform::factory()->create();
         return [
             'student_id' => Student::factory()->create(),
             'provider_user_id' => $this->faker->randomDigitNotNull,
-            'provider_platform_id' => ProviderPlatform::factory()->create(),
+            'provider_platform_id' => $prov->id,
             'consumer_user_id' => $this->faker->randomDigitNotNull,
-            'consumer_platform_id' => ConsumerPlatform::factory()->create(),
+            'consumer_platform_id' => $con->id,
         ];
     }
 }
diff --git a/storage/database.sqlite b/storage/database.sqlite
diff --git a/tests/Feature/ConsumerPlatformTest.php b/tests/Feature/ConsumerPlatformTest.php
@@ -29,7 +29,7 @@ public function testIndex()
     public function testStore()
     {
         $data = [
-            'type' => 'canvas_cloud',
+            'type' => 'unlockedv1',
             'name' => 'TestPlatform',
             'api_key' => 'testkey123',
             'base_url' => 'https://test.com/api',
@@ -48,14 +48,9 @@ public function testShow()
 
     public function testEdit()
     {
-        $platform = [
-            'type' => 'canvas_cloud',
-            'name' => 'TestPlatform',
-            'api_key' => 'testkey123',
-            'base_url' => 'https://test.com/api',
-        ];
+        $platform = ConsumerPlatform::factory()->create();
 
-        $response = $this->put('/api/v1/consumer_platforms/2', $platform);
+        $response = $this->put('/api/v1/consumer_platforms/2', $platform->toArray());
 
         $response->assertStatus(200);
     }
diff --git a/tests/Feature/ProviderPlatformTest.php b/tests/Feature/ProviderPlatformTest.php
@@ -6,23 +6,23 @@
 
 class ProviderPlatformTest extends TestCase
 {
-    public function seedDatabase()
-    {
-        $this->seed();
-    }
+    use RefreshDatabase;
     /**
      * Test retrieving provider platforms.
      */
     public function testGetProviderPlatforms()
     {
+        $this->seed();
         $response = $this->get('/api/v1/provider_platforms');
 
         $response->assertStatus(200);
     }
 
     public function testShowProviderPlatform()
     {
-        $response = $this->get('/api/v1/provider_platforms/1');
+
+        $this->seed();
+        $response = $this->get('/api/v1/provider_platforms/2');
 
         $response->assertStatus(200);
     }
@@ -32,6 +32,7 @@ public function testShowProviderPlatform()
      */
     public function testCreateProviderPlatform()
     {
+        $this->seed();
         $data = [
             'name' => 'TestPlatform',
             'type' => 'canvas_cloud',
diff --git a/tests/Feature/StudentEnrollmentTest.php b/tests/Feature/StudentEnrollmentTest.php
@@ -6,21 +6,15 @@
 
 class StudentEnrollmentControllerTest extends TestCase
 {
-    use RefreshDatabase; // This ensures a fresh database for each test.
-
     public function testShow()
     {
-        DB::statement("PRAGMA foreign_keys = 0");
-        $this->seed();
         $response = $this->get('/api/v1/students/1/courses');
 
         $response->assertStatus(200);
     }
 
     public function testEdit()
     {
-        DB::statement("PRAGMA foreign_keys = 0");
-        $this->seed();
         $studentEnrollment = [
             'provider_user_id' => '1',
             'provider_content_id' => '6',

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,10 @@ class StudentEnrollmentController extends Controller`
`20`	`20`	`// ****************************************************`
`21`	`21`	`public function show(string $id)`
`22`	`22`	`{`
`23`		`- $mapping = StudentMapping::where('student_id', $id)->get();`
	`23`	`+ $mapping = StudentMapping::where('consumer_user_id', $id)->get();`
	`24`	`+`
`24`	`25`	`$enrollments = StudentEnrollment::where('provider_user_id', $mapping->provider_user_id)`
`25`		`- ->where('provider_platform_id', $mapping->provider_platform_id)->where('status', 'in_progress')->all();`
	`26`	`+ ->where('provider_platform_id', $mapping->provider_platform_id)->all();`
`26`	`27`
`27`	`28`	`return StudentEnrollmentResource::collection($enrollments);`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Database\Factories;`
`4`	`4`
	`5`	`+use App\Models\Student;`
`5`	`6`	`use Illuminate\Database\Eloquent\Factories\Factory;`
`6`	`7`
`7`	`8`	`/**`
`@@ -17,7 +18,7 @@ class StudentFactory extends Factory`
`17`	`18`	`public function definition(): array`
`18`	`19`	`{`
`19`	`20`	`return [`
`20`		`- 'id' => $this->faker->uuid(),`
	`21`	`+ 'id' => Student::factory()->create()->id,`
`21`	`22`	`];`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,14 @@ class StudentMappingFactory extends Factory`
`15`	`15`	`{`
`16`	`16`	`public function definition()`
`17`	`17`	`{`
`18`		`- DB::statement('PRAGMA foreign_keys = 0');`
	`18`	`+ $prov = ProviderPlatform::factory()->create();`
	`19`	`+ $con = ConsumerPlatform::factory()->create();`
`19`	`20`	`return [`
`20`	`21`	`'student_id' => Student::factory()->create(),`
`21`	`22`	`'provider_user_id' => $this->faker->randomDigitNotNull,`
`22`		`- 'provider_platform_id' => ProviderPlatform::factory()->create(),`
	`23`	`+ 'provider_platform_id' => $prov->id,`
`23`	`24`	`'consumer_user_id' => $this->faker->randomDigitNotNull,`
`24`		`- 'consumer_platform_id' => ConsumerPlatform::factory()->create(),`
	`25`	`+ 'consumer_platform_id' => $con->id,`
`25`	`26`	`];`
`26`	`27`	`}`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,23 +6,23 @@`
`6`	`6`
`7`	`7`	`class ProviderPlatformTest extends TestCase`
`8`	`8`	`{`
`9`		`- public function seedDatabase()`
`10`		`- {`
`11`		`- $this->seed();`
`12`		`- }`
	`9`	`+ use RefreshDatabase;`
`13`	`10`	`/**`
`14`	`11`	`* Test retrieving provider platforms.`
`15`	`12`	`*/`
`16`	`13`	`public function testGetProviderPlatforms()`
`17`	`14`	`{`
	`15`	`+ $this->seed();`
`18`	`16`	`$response = $this->get('/api/v1/provider_platforms');`
`19`	`17`
`20`	`18`	`$response->assertStatus(200);`
`21`	`19`	`}`
`22`	`20`
`23`	`21`	`public function testShowProviderPlatform()`
`24`	`22`	`{`
`25`		`- $response = $this->get('/api/v1/provider_platforms/1');`
	`23`	`+`
	`24`	`+ $this->seed();`
	`25`	`+ $response = $this->get('/api/v1/provider_platforms/2');`
`26`	`26`
`27`	`27`	`$response->assertStatus(200);`
`28`	`28`	`}`
`@@ -32,6 +32,7 @@ public function testShowProviderPlatform()`
`32`	`32`	`*/`
`33`	`33`	`public function testCreateProviderPlatform()`
`34`	`34`	`{`
	`35`	`+ $this->seed();`
`35`	`36`	`$data = [`
`36`	`37`	`'name' => 'TestPlatform',`
`37`	`38`	`'type' => 'canvas_cloud',`
Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,15 @@`
`6`	`6`
`7`	`7`	`class StudentEnrollmentControllerTest extends TestCase`
`8`	`8`	`{`
`9`		`- use RefreshDatabase; // This ensures a fresh database for each test.`
`10`		`-`
`11`	`9`	`public function testShow()`
`12`	`10`	`{`
`13`		`- DB::statement("PRAGMA foreign_keys = 0");`
`14`		`- $this->seed();`
`15`	`11`	`$response = $this->get('/api/v1/students/1/courses');`
`16`	`12`
`17`	`13`	`$response->assertStatus(200);`
`18`	`14`	`}`
`19`	`15`
`20`	`16`	`public function testEdit()`
`21`	`17`	`{`
`22`		`- DB::statement("PRAGMA foreign_keys = 0");`
`23`		`- $this->seed();`
`24`	`18`	`$studentEnrollment = [`
`25`	`19`	`'provider_user_id' => '1',`
`26`	`20`	`'provider_content_id' => '6',`