devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

refac: 변경한 DTO에 따라 코드 수정

Browse Source 
- Spatie/DataTransferObject 대비
  - MapFrom,MapTo -> RawName
  - Strict -> 항상
     - 심지어 raw type도 더 까다롭게
  - array에 MapConverter 적용
  - NullIsUndefined 적용
  - 빈 nullable arg자리에 null 강제 지정
- Vue3에 v-model.number 지정
  - input type="number" 기준
This commit is contained in:
Hide_D
2022-05-22 22:39:28 +09:00
parent 43a5162a15
commit 78a55fb87a
24 changed files with 152 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/API/Betting/GetBettingDetail.php
+1 -1
View File
@@ -47,7 +47,7 @@ class GetBettingDetail extends \sammo\BaseAPI
}
try{
$bettingInfo = new BettingInfo($rawBettingInfo);
$bettingInfo = BettingInfo::fromArray($rawBettingInfo);
}
catch(\Error $e){
return $e->getMessage();
hwe/sammo/API/Betting/GetBettingList.php
+1 -1
View File
@@ -49,7 +49,7 @@ class GetBettingList extends \sammo\BaseAPI
$bettingList = [];
foreach ($bettingStor->getAll() as $_key => $rawItem) {
$item = new BettingInfo($rawItem);
$item = BettingInfo::fromArray($rawItem);
if ($reqType !== null && $item->type != $reqType) {
continue;
}
hwe/sammo/API/Vote/AddComment.php
+7 -5
View File
@@ -29,6 +29,7 @@ class AddComment extends \sammo\BaseAPI
if (!$v->validate()) {
return $v->errorStr();
}
$this->args['voteID'] = (int)$this->args['voteID'];
return null;
}
@@ -46,11 +47,12 @@ class AddComment extends \sammo\BaseAPI
$comment = new VoteComment(
vote_id: $voteID,
general_id: $generalID,
nation_id: $nationID,
nation_name: $nationName,
general_name: $generalName,
id: null,
voteID: $voteID,
generalID: $generalID,
nationID: $nationID,
nationName: $nationName,
generalName: $generalName,
text: $text,
date: $date
);
hwe/sammo/API/Vote/GetVoteDetail.php
+4 -4
View File
@@ -40,7 +40,7 @@ class GetVoteDetail extends \sammo\BaseAPI
if (!$rawVote) {
return '설문조사가 없습니다.';
}
$voteInfo = new VoteInfo(...$rawVote);
$voteInfo = VoteInfo::fromArray($rawVote);
$votes = array_map(fn ($arr) => [Json::decode($arr[0]), $arr[1]], $db->queryAllLists(
@@ -48,13 +48,13 @@ class GetVoteDetail extends \sammo\BaseAPI
$voteID
));
$comments = VoteComment::arrayOf($db->query('SELECT * FROM vote_comment WHERE vote_id = %i ORDER BY `id` ASC', $voteID));
$comments = array_map(fn ($arr) => VoteComment::fromArray($arr), $db->query('SELECT * FROM vote_comment WHERE vote_id = %i ORDER BY `id` ASC', $voteID));
$myVote = null;
if($session->isGameLoggedIn()){
if ($session->isGameLoggedIn()) {
$generalID = $session->generalID;
$rawMyVote = $db->queryFirstField('SELECT selection FROM vote WHERE vote_id = %i AND general_id = %i', $voteID, $generalID);
if($rawMyVote){
if ($rawMyVote) {
$myVote = Json::decode($rawMyVote);
}
}
hwe/sammo/API/Vote/GetVoteList.php
+1 -1
View File
@@ -33,7 +33,7 @@ class GetVoteList extends \sammo\BaseAPI
continue;
}
$voteID = (int)substr($voteKey, 5);
$votes[$voteID] = new VoteInfo(...$rawVote);
$votes[$voteID] = VoteInfo::fromArray($rawVote);
}
return [
hwe/sammo/API/Vote/NewVote.php
+1 -1
View File
@@ -43,7 +43,7 @@ class NewVote extends \sammo\BaseAPI
if (!$rawLastVoteInfo) {
return;
}
$lastVoteInfo = new VoteInfo(...$rawLastVoteInfo);
$lastVoteInfo = VoteInfo::fromArray($rawLastVoteInfo);
if ($lastVoteInfo->endDate) {
return;
}
hwe/sammo/API/Vote/Vote.php
+1 -1
View File
@@ -58,7 +58,7 @@ class Vote extends \sammo\BaseAPI
if (!$rawVoteInfo) {
return '설문조사가 없습니다.';
}
$voteInfo = new VoteInfo(...$rawVoteInfo);
$voteInfo = VoteInfo::fromArray($rawVoteInfo);
if ($voteInfo->endDate && $voteInfo->endDate < new \DateTimeImmutable()) {
return '설문조사가 종료되었습니다.';
hwe/sammo/Betting.php
+9 -8
View File
@@ -43,7 +43,7 @@ class Betting
if ($rawBettingInfo === null) {
throw new \RuntimeException("해당 베팅이 없습니다: {$bettingID}");
}
$this->info = new BettingInfo($rawBettingInfo);
$this->info = BettingInfo::fromArray($rawBettingInfo);
}
private function _convertBettingKey(array $bettingType): string
@@ -148,13 +148,14 @@ class Betting
}
}
$bettingItem = new BettingItem([
'betting_id' => $this->bettingID,
'general_id' => $generalID,
'user_id' => $userID,
'betting_type' => $bettingTypeKey,
'amount' => $amount
]);
$bettingItem = new BettingItem(
rowID: null,
bettingID: $this->bettingID,
generalID: $generalID,
userID: $userID,
bettingType: $bettingTypeKey,
amount: $amount
);
$db->insertUpdate(
'ng_betting',
hwe/sammo/DTO/BettingInfo.php
+20 -21
View File
@@ -2,33 +2,32 @@
namespace sammo\DTO;
use sammo\DTO\Attr\Convert;
use sammo\DTO\Converter\MapConverter;
use sammo\DTO\SelectItem;
use Spatie\DataTransferObject\Attributes\CastWith;
use Spatie\DataTransferObject\Attributes\Strict;
use Spatie\DataTransferObject\DataTransferObject;
use Spatie\DataTransferObject\Casters\ArrayCaster;
//https://json2dto.atymic.dev/
#[Strict]
class BettingInfo extends DataTransferObject
class BettingInfo extends DTO
{
public int $id;
public string $type;
public string $name;
public bool $finished;
public int $selectCnt;
public ?bool $isExlusive;
public bool $reqInheritancePoint;
public int $openYearMonth;
public int $closeYearMonth;
public function __construct(
public int $id,
public string $type,
public string $name,
public bool $finished,
public int $selectCnt,
public ?bool $isExclusive,
public bool $reqInheritancePoint,
public int $openYearMonth,
public int $closeYearMonth,
/** @var \sammo\DTO\SelectItem[] */
#[CastWith(ArrayCaster::class, itemType: SelectItem::class)]
public array $candidates;
public ?array $winner;
/** @var \sammo\DTO\SelectItem[] */
#[Convert(MapConverter::class, [SelectItem::class])]
public array $candidates,
public ?array $winner,
) {
}
}
hwe/sammo/DTO/BettingItem.php
+18 -22
View File
@@ -2,32 +2,28 @@
namespace sammo\DTO;
use Spatie\DataTransferObject\Attributes\MapFrom;
use Spatie\DataTransferObject\Attributes\MapTo;
use Spatie\DataTransferObject\Attributes\Strict;
use Spatie\DataTransferObject\DataTransferObject;
use sammo\DTO\Attr\NullIsUndefined;
use sammo\DTO\Attr\RawName;
#[Strict]
class BettingItem extends DataTransferObject
class BettingItem extends DTO
{
#[MapFrom('id')]
#[MapTo('id')]
public null|int $rowID = null;
public function __construct(
#[RawName('id')]
#[NullIsUndefined]
public ?int $rowID,
#[MapFrom('betting_id')]
#[MapTo('betting_id')]
public int $bettingID;
#[RawName('betting_id')]
public int $bettingID,
#[MapFrom('general_id')]
#[MapTo('general_id')]
public int $generalID;
#[RawName('general_id')]
public int $generalID,
#[MapFrom('user_id')]
#[MapTo('user_id')]
public null|int $userID;
#[RawName('user_id')]
public ?int $userID,
#[MapFrom('betting_type')]
#[MapTo('betting_type')]
public string $bettingType;
public int $amount;
#[RawName('betting_type')]
public string $bettingType,
public int $amount,
) {
}
}
hwe/sammo/DTO/SelectItem.php
+11 -8
View File
@@ -2,14 +2,17 @@
namespace sammo\DTO;
use Spatie\DataTransferObject\Attributes\Strict;
use Spatie\DataTransferObject\DataTransferObject;
use sammo\DTO\Attr\Convert;
use sammo\DTO\Converter\MapConverter;
#[Strict]
class SelectItem extends DataTransferObject
class SelectItem extends DTO
{
public string $title;
public ?string $info;
public ?bool $isHtml;
public ?array $aux;
public function __construct(
public string $title,
public ?string $info,
public ?bool $isHtml,
#[Convert(MapConverter::class, ['string', 'int', 'float', 'array', 'null', 'bool'])]
public ?array $aux,
) {
}
}
hwe/sammo/DTO/VoteComment.php
+20 -24
View File
@@ -2,37 +2,33 @@
namespace sammo\DTO;
use Spatie\DataTransferObject\Attributes\MapFrom;
use Spatie\DataTransferObject\Attributes\MapTo;
use Spatie\DataTransferObject\Attributes\Strict;
use Spatie\DataTransferObject\DataTransferObject;
use sammo\DTO\Attr\NullIsUndefined;
use sammo\DTO\Attr\RawName;
#[Strict]
class VoteComment extends DataTransferObject
class VoteComment extends DTO
{
public ?int $id;
public function __construct(
#[NullIsUndefined]
public ?int $id,
#[MapFrom('vote_id')]
#[MapTo('vote_id')]
public int $voteID;
#[RawName('vote_id')]
public int $voteID,
#[MapFrom('general_id')]
#[MapTo('general_id')]
public int $generalID;
#[RawName('general_id')]
public int $generalID,
#[MapFrom('nation_id')]
#[MapTo('nation_id')]
public int $nationID;
#[RawName('nation_id')]
public int $nationID,
#[MapFrom('nation_name')]
#[MapTo('nation_name')]
public string $nationName;
#[RawName('nation_name')]
public string $nationName,
#[MapFrom('general_name')]
#[MapTo('general_name')]
public string $generalName;
#[RawName('general_name')]
public string $generalName,
public string $text;
public string $text,
public string $date;
public string $date,
) {
}
}
hwe/sammo/DTO/VoteInfo.php
+11 -16
View File
@@ -2,23 +2,18 @@
namespace sammo\DTO;
use Spatie\DataTransferObject\Attributes\CastWith;
use Spatie\DataTransferObject\Attributes\Strict;
use Spatie\DataTransferObject\DataTransferObject;
use Spatie\DataTransferObject\Casters\ArrayCaster;
//https://json2dto.atymic.dev/
#[Strict]
class VoteInfo extends DataTransferObject
class VoteInfo extends DTO
{
public int $id;
public string $title;
public int $multipleOptions;
public function __construct(
public int $id,
public string $title,
public int $multipleOptions,
public string $startDate;
public ?string $endDate;
public string $startDate,
public ?string $endDate,
/** @var string[] */
public array $options;
/** @var string[] */
public array $options,
) {
}
}
hwe/sammo/Event/Action/OpenNationBetting.php
+3 -1
View File
@@ -72,7 +72,7 @@ class OpenNationBetting extends \sammo\Event\Action
aux: $nationRaw,
);
}
$bettingID = \sammo\Betting::genNextBettingID();
Betting::openBetting(new BettingInfo(
id: $bettingID,
@@ -80,10 +80,12 @@ class OpenNationBetting extends \sammo\Event\Action
name: "{$name} 예상",
finished: false,
selectCnt: $this->nationCnt,
isExclusive: null,
reqInheritancePoint: true,
openYearMonth: $openYearMonth,
closeYearMonth: $closeYearMonth,
candidates: $candidates,
winner: null,
));
$db->insert('event', [
hwe/sammo/GeneralAI.php
+1 -1
View File
@@ -3996,7 +3996,7 @@ class GeneralAI
if (!key_exists($chiefLevel, $this->chiefGenerals) && !key_exists($chiefLevel, $nextChiefs)) {
$newChiefProb = 1;
} else {
$newChiefProb = $this->rng->nextBool(0.1);
$newChiefProb = $this->rng->nextBool(0.1)?1:0;
}
if ($newChiefProb < 1 && !$this->rng->nextBool($newChiefProb)) {