feat(WIP): 국가 베팅 '기능만' 구현

hwe/sammo/API/Betting/Bet.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace sammo\API\NationBetting;
+namespace sammo\API\Betting;
 
 use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
-use Sammo\DTO\BettingItem;
+use sammo\DTO\BettingItem;
 use sammo\Validator;
 use sammo\Json;
 use sammo\DTO\BettingInfo;
@@ -16,18 +16,18 @@ use sammo\Util;
 
 use function sammo\getAllNationStaticInfo;
 
-class BetNation extends \sammo\BaseAPI
+class Bet extends \sammo\BaseAPI
 {
     public function validateArgs(): ?string
     {
         $v = new Validator($this->args);
         $v->rule('required', [
-            'betting_id',
-            'betting_type',
+            'bettingID',
+            'bettingType',
             'amount'
         ])
-            ->rule('integer', 'betting_id')
-            ->rule('integerArray', 'betting_type')
+            ->rule('integer', 'bettingID')
+            ->rule('integerArray', 'bettingType')
             ->rule('integer', 'amount')
             ->rule('min', 'amount', 1);
 
@@ -47,10 +47,10 @@ class BetNation extends \sammo\BaseAPI
         $db = DB::db();
 
         /** @var int */
-        $bettingID = $this->arg['betting_id'];
-        /** @var int[] */
-        $bettingType = $this->arg['betting_type'];
+        $bettingID = $this->args['bettingID'];
         /** @var int[] */
+        $bettingType = $this->args['bettingType'];
+        /** @var int */
         $amount = $this->args['amount'];
 
         $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -75,7 +75,7 @@ class BetNation extends \sammo\BaseAPI
         $yearMonth = Util::joinYearMonth($year, $month);
 
 
-        if($bettingInfo->closeYearMonth > $yearMonth){
+        if($bettingInfo->closeYearMonth <= $yearMonth){
             return '이미 마감된 베팅입니다';
         }
 
@@ -102,15 +102,24 @@ class BetNation extends \sammo\BaseAPI
         }
 
         $bettingTypeKey = Json::encode($bettingType);
-        $general = General::createGeneralObjFromDB($session->generalID, ['gold', 'aux'], 1);
+
+        $inheritStor = KVStorage::getStorage($db, "inheritance_{$session->userID}");
+
+        $prevBetAmount = $db->queryFirstField('SELECT sum(amount) FROM ng_betting WHERE betting_id = %i AND user_id = %i', $bettingID, $session->userID) ?? 0;
+
+        if($prevBetAmount + $amount > 1000){
+            return (1000 - $prevBetAmount).' 포인트까지만 베팅 가능합니다.';
+        }
 
         if($bettingInfo->reqInheritancePoint){
-            if($general->getInheritancePoint('previous') < $amount){
+            $remainPoint = ($inheritStor->getValue('previous') ?? [0,0])[0];
+            if($remainPoint < $amount){
                 return '유산포인트가 충분하지 않습니다.';
             }
         }
         else {
-            if($general->getVar('gold') < GameConst::$generalMinimumGold + $amount){
+            $remainPoint = $db->queryFirstField('SELECT gold FROM general WHERE no = %i', $session->generalID)??0;
+            if($remainPoint < GameConst::$generalMinimumGold + $amount){
                 return '금이 부족합니다.';
             }
         }
@@ -126,17 +135,17 @@ class BetNation extends \sammo\BaseAPI
         ]);
 
         if($bettingInfo->reqInheritancePoint){
-            $general->increaseInheritancePoint('previous', -$amount);
+            $inheritStor->setValue('previous', [$remainPoint - $amount, null]);
         }
         else{
-            $general->increaseVar('gold', -$amount);
+            $db->update('general', [
+                'gold' => $db->sqleval('gold - %i', $amount)
+            ], 'no = %i', $session->generalID);
         }
         $db->insertUpdate('ng_betting', $bettingItem->toArray());
         if(!$db->affected_rows){
-            $general->flushUpdateValues();
             return '베팅을 실패했습니다.';
         }
-        $general->applyDB($db);
 
         return [
             'result'=>true

hwe/sammo/API/Betting/GetBettingDetail.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace sammo\API\NationBetting;
+namespace sammo\API\Betting;
 
 use sammo\Session;
 use DateTimeInterface;
@@ -8,6 +8,7 @@ use sammo\DB;
 use sammo\DTO\BettingInfo;
 use sammo\General;
 use sammo\KVStorage;
+use sammo\Util;
 use sammo\Validator;
 
 use function sammo\increaseRefresh;
@@ -39,7 +40,7 @@ class GetBettingDetail extends \sammo\BaseAPI
 
         increaseRefresh("국가베팅장", 1);
         /** @var int */
-        $bettingID = $this->arg['betting_id'];
+        $bettingID = $this->args['betting_id'];
 
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $bettingStor = KVStorage::getStorage($db, 'betting');
@@ -63,7 +64,7 @@ class GetBettingDetail extends \sammo\BaseAPI
             'SELECT betting_type, sum(amount) as sum_amount FROM ng_betting WHERE betting_id = %i GROUP BY betting_type',
             $bettingID
         ) as [$bettingType, $amount]) {
-            $bettingDetail[] = [$bettingType, $amount];
+            $bettingDetail[] = [$bettingType, Util::toInt($amount)];
         }
 
         [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
@@ -73,20 +74,19 @@ class GetBettingDetail extends \sammo\BaseAPI
             'SELECT betting_type, sum(amount) as sum_amount FROM ng_betting WHERE betting_id = %i AND user_id = %i GROUP BY betting_type',
             $bettingID, $session->userID
         ) as [$bettingType, $amount]){
-            $myBetting[] = [$bettingType, $amount];
+            $myBetting[] = [$bettingType, Util::toInt($amount)];
         }
 
-        $general = General::createGeneralObjFromDB($session->generalID, ['gold', 'aux'], 1);
-
         if($bettingInfo->reqInheritancePoint){
-            $remainPoint = $general->getInheritancePoint('previous');
+            $inheritStor = KVStorage::getStorage($db, "inheritance_{$session->userID}");
+            $remainPoint = ($inheritStor->getValue('previous') ?? [0,0])[0];
         }
         else{
-            $remainPoint = $general->getVar('gold');
+            $remainPoint = $db->queryFirstField('SELECT gold FROM general WHERE no = %i', $session->generalID)??0;
         }
 
         return [
-            'result' => false,
+            'result' => true,
             'bettingInfo' => $rawBettingInfo,
             'bettingDetail' => $bettingDetail,
             'myBetting' => $myBetting,

hwe/sammo/API/Betting/GetBettingList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace sammo\API\NationBetting;
+namespace sammo\API\Betting;
 
 use sammo\Session;
 use DateTimeInterface;
@@ -42,6 +42,7 @@ class GetBettingList extends \sammo\BaseAPI
         $bettingList = [];
         foreach ($bettingStor->getAll() as $_key => $rawItem) {
             $item = new BettingInfo($rawItem);
+            unset($rawItem['candidates']);
             $bettingList[$item->id] = $rawItem;
             $bettingList[$item->id]['totalAmount'] = 0;
         }
@@ -61,7 +62,7 @@ class GetBettingList extends \sammo\BaseAPI
         [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
 
         return [
-            'result' => false,
+            'result' => true,
             'bettingList' => $bettingList,
             'year' => $year,
             'month' => $month,