Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	CHANGELOG.md
#	src/Notifications/SeatGroupApplication/AbstractSeatGroupApplicationNotification.php
#	src/config/seatgroups.config.php

.travis.yml

@@ -0,0 +1,29 @@
+env:
+  global:
+  - CC_TEST_REPORTER_ID=5eb31309405cc7b8e6fd74b40e52f2bc072a25dd66900e96ed6bca168c0a720d
+
+language: php
+
+php:
+  - 7.2.1
+
+services:
+  - redis-server
+
+addons:
+  hosts:
+    - redis
+
+before_script:
+  - composer self-update
+  - composer install --no-interaction
+  - composer dump-autoload
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+
+script:
+  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

CHANGELOG.md

@@ -1,3 +1,11 @@
+# Version 1.7.1
+This new version has two main purposes:
+1. introduce testing
+2. temporally disable group memberships
+
+Firstly i have introduced testing to strengthen my confidence in seat-groups. Doing so, i am able to work on seat-groups with the confidence i need and assure not breaking anything.
+Secondly, users now will lose a role gained through SeAT Group role temporally if the user group is missing a refresh token. As soon as its been regained the user group will regain the roles from its SeAT Groups he is member of and is qualified (meaning has valid affiliation) for.
+
 # Version 1.7.0
 This version allows the usage of seat-notifications 2.0. Be aware your subscriptions have been reset and you must resubscribe.
 

README.md

@@ -5,6 +5,8 @@ which correlate to SeAT-Roles.
 [![Latest Stable Version](https://poser.pugx.org/herpaderpaldent/seat-groups/v/stable)](https://packagist.org/packages/herpaderpaldent/seat-groups)
 [![StyleCI](https://github.styleci.io/repos/120507448/shield?branch=master)](https://github.styleci.io/repos/120507448)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ec32c88b40e1407ede38/maintainability)](https://codeclimate.com/github/herpaderpaldent/seat-groups/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/ec32c88b40e1407ede38/test_coverage)](https://codeclimate.com/github/herpaderpaldent/seat-groups/test_coverage)
+[![Build Status](https://travis-ci.org/herpaderpaldent/seat-groups.svg?branch=master)](https://travis-ci.org/herpaderpaldent/seat-groups)
 [![License](https://poser.pugx.org/herpaderpaldent/seat-groups/license)](https://packagist.org/packages/herpaderpaldent/seat-groups)
 [![Total Downloads](https://poser.pugx.org/herpaderpaldent/seat-groups/downloads)](https://packagist.org/packages/herpaderpaldent/seat-groups)
 

composer.json

@@ -5,12 +5,14 @@
     "require": {
         "php": ">=7.1",
         "laravel/framework": "5.5.*",
-        "eveseat/web": "~3.0.14"
+        "eveseat/web": "~3.0.15"
     },
     "require-dev": {
-        "orchestra/testbench": "3.5.*",
+        "orchestra/testbench": "~3.5",
         "orchestra/database" : "~3.5",
-        "phpunit/phpunit": "~6.0"
+        "phpunit/phpunit": "~6.0",
+        "spatie/phpunit-watcher": "^1.8",
+        "codeclimate/php-test-reporter": "^0.4.4"
     },
     "conflict": {
         "herpaderpaldent/seat-notifications": "<2.0.0"
@@ -26,7 +28,7 @@
     "prefer-stable": true,
     "autoload": {
         "psr-4": {
-            "Herpaderpaldent\\Seat\\SeatGroups\\": "src/"
+            "Herpaderpaldent\\Seat\\SeatGroups\\": "src"
         }
     },
     "autoload-dev": {
@@ -35,7 +37,8 @@
         }
     },
     "scripts":{
-        "test": "vendor/bin/phpunit"
+        "test": "vendor/bin/phpunit",
+        "watch": "vendor/bin/phpunit-watcher watch"
     },
     "extra": {
         "laravel": {

phpunit.xml

@@ -15,7 +15,18 @@
             <directory suffix="Test.php">./tests/</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src/</directory>
+        </whitelist>
+    </filter>
     <php>
         <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+        <env name="REDIS_HOST" value="redis"/>
+        <env name="REDIS_PASSWORD" value="null"/>
+        <env name="REDIS_PORT" value="6379"/>
     </php>
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
 </phpunit>

src/Actions/Alliances/AddAllianceAffiliation.php

@@ -8,7 +8,7 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\Alliances;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 
 class AddAllianceAffiliation
 {
@@ -17,7 +17,7 @@ public function execute(array $data)
         $seat_group_id = $data['seatgroup_id'];
         $alliance_ids = $data['alliance_ids'];
 
-        $seat_group = Seatgroup::find($seat_group_id);
+        $seat_group = SeatGroup::find($seat_group_id);
 
         $seat_group->alliance()->attach($alliance_ids);
 

src/Actions/Alliances/RemoveAllianceAffiliation.php

@@ -8,7 +8,7 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\Alliances;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 
 class RemoveAllianceAffiliation
 {
@@ -17,7 +17,7 @@ public function execute(array $data)
         $seat_group_id = $data['seatgroup_id'];
         $alliance_ids = $data['alliance_ids'];
 
-        $seat_group = Seatgroup::find($seat_group_id);
+        $seat_group = SeatGroup::find($seat_group_id);
 
         $seat_group->alliance()->detach($alliance_ids);
 

src/Actions/Corporations/AddCorporationAffiliationAction.php

@@ -2,7 +2,8 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\Corporations;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Exception;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 use Seat\Services\Repositories\Corporation\Corporation;
 
 class AddCorporationAffiliationAction
@@ -20,22 +21,30 @@ public function execute(array $data)
         $seat_group_id = $data['seatgroup_id'];
         $corporations = $data['corporation_ids'];
 
-        $seat_group = Seatgroup::find($seat_group_id);
+        try {
+            $seat_group = SeatGroup::findOrFail($seat_group_id);
 
-        if(in_array('-1', $corporations)){
-            // First set SeAT Group to $all_corporation = true
-            $seat_group->all_corporations = true;
-            $seat_group->save();
+            if(in_array('-1', $corporations)){
+                // First set SeAT Group to $all_corporation = true
+                $seat_group->all_corporations = true;
+                $seat_group->save();
 
-            // Secondly remove the -1 value from the array
-            $corporations = array_filter($corporations, function ($value) {
-                return $value !== '-1';
-            });
-        }
+                // Secondly remove the -1 value from the array
+                $corporations = array_filter($corporations, function ($value) {
+                    return $value !== '-1';
+                });
+            }
+
+            $seat_group->corporation()->attach($corporations);
+
+            return true;
 
-        $seat_group->corporation()->attach($corporations);
+        } catch (Exception $e) {
 
-        return true;
+            report($e);
+
+            return false;
+        }
 
     }
 }

src/Actions/Corporations/GetCorporationListAction.php

@@ -8,15 +8,15 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\Corporations;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 use Seat\Eveapi\Models\Corporation\CorporationInfo;
 
 class GetCorporationListAction //TODO: Refactor this Class and rename
 {
     public function execute(array $data)
     {
 
-        $seatgroup = Seatgroup::find($data['seatgroup_id']);
+        $seatgroup = SeatGroup::find($data['seatgroup_id']);
 
         $existing_affiliations = collect();
 

src/Actions/Corporations/RemoveAllCorporationAffiliationAction.php

@@ -8,15 +8,15 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\Corporations;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 
 class RemoveAllCorporationAffiliationAction
 {
     public function execute(array $data)
     {
         try {
             $seatgroup_id = $data['seatgroup_id'];
-            $seatgroup = Seatgroup::find($seatgroup_id);
+            $seatgroup = SeatGroup::find($seatgroup_id);
 
             $seatgroup->all_corporations = false;
             $seatgroup->save();

src/Actions/Corporations/RemoveCorpAffiliationAction.php

@@ -2,7 +2,7 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\Corporations;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 use Seat\Services\Repositories\Corporation\Corporation;
 
 class RemoveCorpAffiliationAction
@@ -20,7 +20,7 @@ public function execute(array $data)
             $group_id = $data['seatgroup_id'];
             $corporation_id = $data['corporation_id'];
 
-            $seat_group = Seatgroup::find($group_id);
+            $seat_group = SeatGroup::find($group_id);
 
             $seat_group->corporation()->detach($corporation_id);
 

src/Actions/Corporations/Titles/GetCorporationTitleAction.php

@@ -8,7 +8,7 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\Corporations\Titles;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 use Seat\Eveapi\Models\Corporation\CorporationTitle;
 
 class GetCorporationTitleAction
@@ -18,7 +18,7 @@ public function execute(array $data)
         $corporationId = $data['corporation_id'];
         $seatgroup_id = $data['seatgroup_id'];
 
-        $existing_affiliations = Seatgroup::find($seatgroup_id)
+        $existing_affiliations = SeatGroup::find($seatgroup_id)
             ->corporationTitles
             ->where('corporation_id', $corporationId)
             ->pluck('title_id');

src/Actions/Managers/AddManagerAction.php

@@ -8,13 +8,13 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\Managers;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 
 class AddManagerAction
 {
     public function execute(array $data)
     {
-        $seatgroup = Seatgroup::find($data['seatgroup_id']);
+        $seatgroup = SeatGroup::find($data['seatgroup_id']);
 
         if(isset($data['groups'])){
             $groups = $data['groups'];

src/Actions/Managers/RemoveManagerAction.php

@@ -8,13 +8,13 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\Managers;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 
 class RemoveManagerAction
 {
     public function execute(array $data)
     {
-        $seatgroup = Seatgroup::find($data['seatgroup_id']);
+        $seatgroup = SeatGroup::find($data['seatgroup_id']);
         $group_id = $data['group_id'];
         $children_id = $data['children_id'];
 

src/Actions/Seat/GetMainCharacterAction.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Herpaderpaldent\Seat\SeatGroups\Actions\Seat;
+
+use Herpaderpaldent\Seat\SeatGroups\Exceptions\MissingMainCharacterException;
+use Seat\Web\Models\Group;
+
+class GetMainCharacterAction
+{
+    public function execute(Group $group)
+    {
+        $main_character = $group->main_character;
+
+        if (is_null($main_character)) {
+            logger()->warning('Group has no main character set. Attempt to make assignation based on first attached character.', [
+                'group_id' => $group->id,
+            ]);
+            $main_character = optional($group->users()->has('character')->first())->character;
+        }
+
+        if (is_null($main_character))
+            throw new MissingMainCharacterException($group);
+
+        return $main_character;
+
+    }
+}

src/Actions/SeatGroups/CreateSeatGroup.php

@@ -8,14 +8,14 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\SeatGroups;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 
 class CreateSeatGroup
 {
-    public function execute(array $data) : Seatgroup
+    public function execute(array $data) : SeatGroup
     {
         //dd($data);
-        $seat_group = new Seatgroup;
+        $seat_group = new SeatGroup;
         $seat_group->name = $data['name'];
         $seat_group->description = $data['description'];
         $seat_group->type = $data['type'];

src/Actions/SeatGroups/DeleteSeatGroup.php

@@ -8,15 +8,15 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\SeatGroups;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 
 class DeleteSeatGroup
 {
     public function execute(array $data)
     {
         $group_id = $data['seatgroup_id'];
 
-        $seatgroup = Seatgroup::find($group_id);
+        $seatgroup = SeatGroup::find($group_id);
         $seatgroup->delete();
 
         return true;

src/Actions/SeatGroups/GetCurrentAffiliationAction.php

@@ -8,15 +8,15 @@
 
 namespace Herpaderpaldent\Seat\SeatGroups\Actions\SeatGroups;
 
-use Herpaderpaldent\Seat\SeatGroups\Models\Seatgroup;
+use Herpaderpaldent\Seat\SeatGroups\Models\SeatGroup;
 use Seat\Eveapi\Models\Corporation\CorporationInfo;
 use Seat\Eveapi\Models\Corporation\CorporationTitle;
 
 class GetCurrentAffiliationAction
 {
     public function execute(array $data)
     {
-        $seatgroup = Seatgroup::find($data['seatgroup_id']);
+        $seatgroup = SeatGroup::find($data['seatgroup_id']);
 
         $affiliations = collect();