From 52fd8cb8b794d0458b30a7806d981facf8cdf56a Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Sun, 15 May 2016 22:43:22 +0200
Subject: [PATCH] closed #154 added alliance maps to CREST API

---
 app/main/controller/ccp/sso.php        |  3 +++
 app/main/controller/logcontroller.php  |  1 -
 app/main/data/mapper/crestalliance.php | 18 ++++++++++++++++++
 app/main/model/charactermodel.php      | 24 ++++++++++++------------
 4 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 app/main/data/mapper/crestalliance.php

diff --git a/app/main/controller/ccp/sso.php b/app/main/controller/ccp/sso.php
index 74bf96fe..4ce1169c 100644
--- a/app/main/controller/ccp/sso.php
+++ b/app/main/controller/ccp/sso.php
@@ -593,6 +593,9 @@ class Sso extends Api\User{
             if(isset($endpoint['corporation'])){
                 $characterData->corporation = (new Mapper\CrestCorporation($endpoint['corporation']))->getData();
             }
+            if(isset($endpoint['alliance'])){
+                $characterData->alliance = (new Mapper\CrestAlliance($endpoint['alliance']))->getData();
+            }
         }
 
         return $characterData;
diff --git a/app/main/controller/logcontroller.php b/app/main/controller/logcontroller.php
index 59589033..daade6cc 100644
--- a/app/main/controller/logcontroller.php
+++ b/app/main/controller/logcontroller.php
@@ -31,7 +31,6 @@ class LogController extends Controller  {
             $f3->set($hiveKey, new \Log($logFile));
         }
 
-
         return $f3->get($hiveKey);
     }
 
diff --git a/app/main/data/mapper/crestalliance.php b/app/main/data/mapper/crestalliance.php
new file mode 100644
index 00000000..5d2bceea
--- /dev/null
+++ b/app/main/data/mapper/crestalliance.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Exodus
+ * Date: 15.05.2016
+ * Time: 22:04
+ */
+
+namespace Data\Mapper;
+
+
+class CrestAlliance extends AbstractIterator {
+
+    protected static $map = [
+        'id' => 'id',
+        'name' => 'name'
+    ];
+}
\ No newline at end of file
diff --git a/app/main/model/charactermodel.php b/app/main/model/charactermodel.php
index c46cfafe..c4c9a716 100644
--- a/app/main/model/charactermodel.php
+++ b/app/main/model/charactermodel.php
@@ -436,7 +436,7 @@ class CharacterModel extends BasicModel {
                          */
                         $corporation = $this->rel('corporationId');
                         $corporation->getById($characterData->corporation['id'], 0);
-                        $corporation->copyfrom($characterData->corporation, ['name', 'isNPC']);
+                        $corporation->copyfrom($characterData->corporation, ['id', 'name', 'isNPC']);
                         $corporation->save();
                     }
 
@@ -446,13 +446,13 @@ class CharacterModel extends BasicModel {
                          */
                         $alliance = $this->rel('allianceId');
                         $alliance->getById($characterData->alliance['id'], 0);
-                        $alliance->copyfrom($characterData->alliance, ['name']);
+                        $alliance->copyfrom($characterData->alliance, ['id', 'name']);
                         $alliance->save();
                     }
 
                     $this->copyfrom($characterData->character, ['name', 'ownerHash']);
                     $this->set('corporationId', is_object($corporation) ? $corporation->get('id') : null);
-                    $this->set('allianceId', is_object($alliance) ? $corporation->get('id') : null);
+                    $this->set('allianceId', is_object($alliance) ? $alliance->get('id') : null);
                     $this->save();
                 }
             }else{
@@ -517,7 +517,6 @@ class CharacterModel extends BasicModel {
      * @return MapModel[]
      */
     public function getMaps(){
-
         $this->filter(
             'characterMaps',
             ['active = ?', 1],
@@ -525,6 +524,15 @@ class CharacterModel extends BasicModel {
         );
 
         $maps = [];
+
+        if($alliance = $this->getAlliance()){
+            $maps = array_merge($maps, $alliance->getMaps());
+        }
+
+        if($corporation = $this->getCorporation()){
+            $maps = array_merge($maps,  $corporation->getMaps());
+        }
+
         if($this->characterMaps){
             $mapCountPrivate = 0;
             foreach($this->characterMaps as &$characterMap){
@@ -535,14 +543,6 @@ class CharacterModel extends BasicModel {
             }
         }
 
-        if($alliance = $this->getAlliance()){
-            $maps = array_merge($maps, $alliance->getMaps());
-        }
-
-        if($corporation = $this->getCorporation()){
-            $maps = array_merge($maps,  $corporation->getMaps());
-        }
-
         return $maps;
     }