[3cf9d39cf2]DB 스키마 정리, diplomacy 테이블 정리, 코드 정리

hwe/sammo/Command/Nation/che_불가침제의.php

@@ -37,11 +37,6 @@ class che_불가침제의 extends Command\NationCommand{
             return false;
         }
 
-        $optionText = $this->arg['optionText']??'';
-        if(!is_string($optionText)){
-            return false;
-        }
-
         if(!key_exists('year', $this->arg) || !key_exists('month', $this->arg) ){
             return false;
         }
@@ -61,7 +56,6 @@ class che_불가침제의 extends Command\NationCommand{
 
         $this->arg = [
             'destNationID'=>$destNationID,
-            'optionText'=>$optionText,
             'year'=>$year,
             'month'=>$month,
         ];
@@ -177,17 +171,10 @@ class che_불가침제의 extends Command\NationCommand{
                 'action'=>DiplomaticMessage::TYPE_NO_AGGRESSION,
                 'year'=>$year,
                 'month'=>$month,
-                'option'=>$this->arg['optionText'],
             ]
         );
         $msg->send();
 
-        //FIXME: 현재 내무부, 외교란이 구형 코드임. diplomacy_ticket을 이용하여 재구현
-        $db->update('diplomacy', [
-            'showing'=>$validUntil->format('Y-m-d H:i:s'),
-            'reserved'=>$this->arg['optionText'],
-        ], 'me=%i AND you=%i', $nationID, $destNationID);
-
         $general->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->applyDB($db);
         $destGeneral->applyDB($db);

hwe/sammo/DiplomaticMessage.php

@@ -73,7 +73,6 @@ class DiplomaticMessage extends Message{
 
     protected function noAggression(){
         $year = Util::array_get($this->msgOption['year']);
-        $option = Util::array_get($this->msgOption['option'])??'';
         if($year < 1 || $year > 30){
             return [self::INVALID, '올바르지 않은 불가침 서신입니다.'];
         }
@@ -81,7 +80,7 @@ class DiplomaticMessage extends Message{
         $this->diplomacyDetail = "{$year}년";
 
         $helper = new Engine\Diplomacy($this->src->nationID, $this->dest->nationID);
-        $chk = $helper->noAggression($year, $option);
+        $chk = $helper->noAggression($year);
         if($chk[0] !== self::ACCEPTED){
             return $chk;
         }
@@ -284,13 +283,6 @@ class DiplomaticMessage extends Message{
         
 
         list($result, $reason) = $this->checkDiplomaticMessageValidation($general);
-        $db->update('diplomacy', [
-            'reserved'=>'',
-            'showing'=>null
-        ], '(me=%s AND you=%s) OR (you=%s AND me=%s)',
-            $this->src->nationID, $this->dest->nationID,
-            $this->src->nationID, $this->dest->nationID
-        );
         if($result !== self::ACCEPTED){
             pushGenLog(['no'=>$receiverID], ["<C>●</>{$reason} {$this->diplomacyName} 실패."]);
             if($result === self::DECLINED){

hwe/sammo/Engine/Diplomacy.php

@@ -273,7 +273,7 @@ class Diplomacy{
         return $prev;
     }
 
-    public function noAggression(int $when, string $option){
+    public function noAggression(int $when){
         $chk = $this->checkValidNation();
         $chk = $this->checkNotWar($chk);
         $chk = $this->checkAlreadyMerging($chk);
@@ -286,8 +286,7 @@ class Diplomacy{
         $db = DB::db();
         $db->update('diplomacy',[
             'state'=>7,
-            'term'=>$when*12,
-            'fixed'=>$option
+            'term'=>$when*12
         ],
         '(me=%i AND you=%i) OR (you=%i AND me=%i)', 
         $this->srcNation['nation'], $this->destNation['nation'],
@@ -308,8 +307,7 @@ class Diplomacy{
         $db = DB::db();
         $db->update('diplomacy',[
             'state'=>2,
-            'term'=>0,
-            'fixed'=>''
+            'term'=>0
         ],
         '(me=%i AND you=%i) OR (you=%i AND me=%i)', 
         $this->srcNation['nation'], $this->destNation['nation'],
@@ -330,8 +328,7 @@ class Diplomacy{
         $db = DB::db();
         $db->update('diplomacy',[
             'state'=>2,
-            'term'=>0,
-            'fixed'=>''
+            'term'=>0
         ],
         '(me=%i AND you=%i) OR (you=%i AND me=%i)', 
         $this->srcNation['nation'], $this->destNation['nation'],
@@ -356,16 +353,14 @@ class Diplomacy{
         $db = DB::db();
         $db->update('diplomacy',[
             'state'=>4,
-            'term'=>24,
-            'fixed'=>''
+            'term'=>24
         ],
         'me=%i AND you=%i', 
         $this->srcNation['nation'], $this->destNation['nation']);
 
         $db->update('diplomacy',[
             'state'=>3,
-            'term'=>24,
-            'fixed'=>''
+            'term'=>24
         ],
         'you=%i AND me=%i', 
         $this->srcNation['nation'], $this->destNation['nation']);
@@ -389,16 +384,14 @@ class Diplomacy{
         $db = DB::db();
         $db->update('diplomacy',[
             'state'=>6,
-            'term'=>24,
-            'fixed'=>''
+            'term'=>24
         ],
         'me=%i AND you=%i', 
         $this->srcNation['nation'], $this->destNation['nation']);
 
         $db->update('diplomacy',[
             'state'=>5,
-            'term'=>24,
-            'fixed'=>''
+            'term'=>24
         ],
         'you=%i AND me=%i', 
         $this->srcNation['nation'], $this->destNation['nation']);