dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

closed #154 added alliance maps to CREST API

Browse Source
This commit is contained in:
Exodus4D
2016-05-15 22:43:22 +02:00
parent 5421bd3060
commit 52fd8cb8b7
4 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/main/controller/ccp/sso.php
View File

@@ -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;

1
app/main/controller/logcontroller.php
View File

@@ -31,7 +31,6 @@ class LogController extends Controller {
$f3->set($hiveKey, new \Log($logFile));
}
return $f3->get($hiveKey);
}

18
app/main/data/mapper/crestalliance.php Normal file
View File

@@ -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'
];
}

24
app/main/model/charactermodel.php
View File

@@ -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;
}