#277 writing tests

cncnet-api/app/Commands/Matchup/PlayerMatchupHandler.php

@@ -148,6 +148,7 @@ public function matchup()
             foreach ($qmMaps as $qmMap)
             {
                 $match = true;
+
                 if (
                     array_key_exists(
                         $qmMap->bit_idx,

cncnet-api/app/Http/Controllers/ApiQuickMatchController.php

@@ -396,6 +396,9 @@ public function matchRequest(Request $request, $ladderAbbrev = null, $playerName
      */
     private function onMatchMeUp($request, $ladder, $player, $qmPlayer)
     {
+
+        Log::info('request : ' . json_encode($request->all()));
+
         $ladderRules = $ladder->qmLadderRules()->first();
         $history = $ladder->currentHistory();
         $user = $player->user;

cncnet-api/app/Models/GameObjectSchema.php

@@ -1,9 +1,12 @@
 <?php namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class GameObjectSchema extends Model {
 
+    use HasFactory;
+
     //
     protected $fillable = [ 'name' ];
 

cncnet-api/app/Models/Ladder.php

@@ -3,10 +3,12 @@
 namespace App\Models;
 
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Ladder extends Model
 {
+    use HasFactory;
     protected $table = 'ladders';
 
     protected $fillable = [

cncnet-api/app/Models/LadderHistory.php

@@ -3,10 +3,13 @@
 namespace App\Models;
 
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class LadderHistory extends Model
 {
+    use HasFactory;
+
     protected $table = 'ladder_history';
     protected $casts = [
         'starts' => 'datetime',

cncnet-api/app/Models/Map.php

@@ -2,10 +2,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Map extends Model
 {
+    use HasFactory;
     protected $table = 'maps';
     protected $fillable = ['name', 'hash', 'ladder_id', 'spawn_count'];
     public $timestamps = false;

cncnet-api/app/Models/MapPool.php

@@ -1,9 +1,12 @@
 <?php namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class MapPool extends Model {
 
+    use HasFactory;
+
     protected $fillable = [
         'name',
         'ladder_id'

cncnet-api/app/Models/QmLadderRules.php

@@ -2,10 +2,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class QmLadderRules extends Model
 {
+    use HasFactory;
 
     protected $fillable = [
         'ladder_id', 'player_count', 'map_vetoes', 'max_difference', 'all_sides',

cncnet-api/app/Models/QmMap.php

@@ -1,15 +1,19 @@
 <?php namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class QmMap extends Model {
 
+    use HasFactory;
+
     protected $fillable = [
         'ladder_id',
         'map_pool_id',
         'map_id',
         'valid',
         'description',
+        'allowed_sides',
     ];
 
 	//

cncnet-api/app/Models/Side.php

@@ -1,9 +1,18 @@
 <?php namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Side extends Model {
 
+    use HasFactory;
+
+    protected $fillable = [
+        'ladder_id',
+        'local_id',
+        'name'
+    ];
+
 	//
     public function ladder()
     {

cncnet-api/composer.json

@@ -39,7 +39,8 @@
 			"tests/TestCase.php"
 		],
 		"psr-4": {
-			"Tests\\": "tests/"
+			"Tests\\": "tests/",
+			"Database\\Factories\\": "app/database/factories/"
 		}
 	},
 	"scripts": {

cncnet-api/database/factories/GameObjectSchemaFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\GameObjectSchema>
+ */
+class GameObjectSchemaFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->words(3, true)
+        ];
+    }
+}

cncnet-api/database/factories/LadderFactory.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\GameObjectSchema;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Ladder>
+ */
+class LadderFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->words(3, true),
+            'abbreviation' => $this->faker->randomLetter() . $this->faker->randomLetter(),
+            'game' => 'yr',
+            'clans_allowed' => false,
+            'game_object_schema_id' => GameObjectSchema::factory(),
+            'private' => false,
+        ];
+    }
+}

cncnet-api/database/factories/LadderHistoryFactory.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\LadderHistory>
+ */
+class LadderHistoryFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'starts' => today()->startOfMonth(),
+            'ends' => today()->endOfMonth(),
+            'short' => today()->startOfMonth()->format('n-Y')
+        ];
+    }
+}

cncnet-api/database/factories/MapFactory.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\Hash;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Map>
+ */
+class MapFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->words(2, true),
+            'hash' => Hash::make($this->faker->name),
+            'spawn_count' => 2,
+        ];
+    }
+}

cncnet-api/database/factories/MapPoolFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\MapPool>
+ */
+class MapPoolFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->name,
+        ];
+    }
+}

cncnet-api/database/factories/QmLadderRulesFactory.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\QmLadderRules>
+ */
+class QmLadderRulesFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'player_count' => 2,
+            'map_vetoes' => 0,
+            'max_difference' => 498,
+            'all_sides' => '0,1,2,3,4,5,6,7,8,9',
+            'allowed_sides' => '0,1,2',
+            'bail_time' => 0,
+            'bail_fps' => 0,
+            'tier2_rating' => 1200,
+            'rating_per_second' => 0.75,
+            'max_points_difference' => 400,
+            'points_per_second' => 1,
+            'use_elo_points' => 1,
+            'wol_k' => 64,
+            'show_map_preview' => 1,
+            'reduce_map_repeats' => 5,
+            'use_ranked_map_picker' => 0,
+        ];
+    }
+}

cncnet-api/database/factories/QmMapFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\QmMap>
+ */
+class QmMapFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            //
+        ];
+    }
+}

cncnet-api/database/factories/SideFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Side>
+ */
+class SideFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->country
+        ];
+    }
+}