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

feat,wip: 경매장을 db table로 분리

Browse Source
This commit is contained in:
Hide_D
2022-06-09 01:21:21 +09:00
parent bb04632a7f
commit 9b1a57bbd2
5 changed files with 90 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Auction.php
+19 -46
View File
@@ -5,21 +5,17 @@ namespace sammo;
use DateTime;
use DateTimeImmutable;
use DateTimeInterface;
use Ds\Map;
use sammo\DTO\AuctionBidItem;
use sammo\DTO\AuctionBidItemData;
use sammo\DTO\AuctionInfo;
use sammo\Enums\InheritanceKey;
use sammo\Enums\RankColumn;
use sammo\Enums\ResourceType;
use sammo\VO\InheritancePointType;
class Auction
{
protected AuctionInfo $info;
public const LAST_AUCTION_ID_KEY = 'last_auction_id';
public const COEFF_AUCTION_CLOSE_MINUTES = 24;
public const COEFF_EXTENSION_MINUTES_PER_BID = 1 / 6;
@@ -30,39 +26,24 @@ class Auction
public const MIN_EXTENSION_MINUTES_LIMIT_BY_BID = 5;
public const MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY = 5;
static public function genNextAuctionID(): int
static public function openAuction(AuctionInfo $info, General $general): int|string
{
$db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env');
$gameStor->invalidateCacheValue(self::LAST_AUCTION_ID_KEY);
$auctionID = ($gameStor->getValue(self::LAST_AUCTION_ID_KEY) ?? 0) + 1;
$gameStor->setValue(self::LAST_AUCTION_ID_KEY, $auctionID);
return $auctionID;
}
static public function openAuction(AuctionInfo $info, General $general): ?string
{
$db = DB::db();
$auctionID = $info->id;
$auctionStor = KVStorage::getStorage($db, 'auction');
$openedAuction = $general->getAuxVar('openedAuction') ?? [];
$prevAuctionID = $openedAuction[$info->type->value] ?? null;
if ($prevAuctionID !== null) {
//XXX: 이 구조보다는 차라리 DB에 insert로 넣는 게 나을 수도.
$prevAuction = new Auction($prevAuctionID, $general);
if (!$prevAuction->info->finished) {
return '아직 경매가 끝나지 않았습니다.';
}
unset($openedAuction[$info->type->value]);
$general->setAuxVar('openedAuction', $openedAuction);
if ($info->id !== null) {
return 'id가 지정되어 있습니다.';
}
$auctionStor->setValue("id_{$auctionID}", $info->toArray());
$prevAuctionID = $db->queryFirstField(
'SELECT id FROM ng_auction WHERE opener_general_id = %i AND finished = 0 AND `type` = %s',
$general->getID(),
$info->type
);
if ($prevAuctionID !== null) {
return '아직 경매가 끝나지 않았습니다.';
}
$db->insert('ng_auction', $info->toArray());
return $db->insertId();
}
public function getHighestBid(): ?AuctionBidItem
@@ -96,8 +77,7 @@ class Auction
public function __construct(protected readonly int $auctionID, protected General $general)
{
$db = DB::db();
$auctionStor = KVStorage::getStorage($db, 'auction');
$rawAuctionInfo = $auctionStor->getValue("id_{$auctionID}");
$rawAuctionInfo = $db->query('SELECT * FROM ng_auction WHERE id = %i', $auctionID);
if ($rawAuctionInfo === null) {
throw new \RuntimeException("해당 경매가 없습니다: {$auctionID}");
}
@@ -111,7 +91,7 @@ class Auction
public function extendCloseDate(DateTimeInterface $date, bool $force = false): ?string
{
if(!$force){
if (!$force) {
if ($this->info->remainCloseExtensionCnt === null) {
return '연장할 수 없는 경매입니다.';
}
@@ -124,7 +104,6 @@ class Auction
}
$db = DB::db();
$auctionStor = KVStorage::getStorage($db, 'auction');
$gameStor = KVStorage::getStorage($db, 'game_env');
$turnTerm = $gameStor->getValue('turnterm');
$closeDate = DateTimeImmutable::createFromInterface($date);
@@ -132,7 +111,7 @@ class Auction
$this->info->availableLatestBidCloseDate = $closeDate->add(TimeUtil::secondsToDateInterval(
max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID) * 60
));
$auctionStor->setValue("id_{$this->info->id}", $this->info->toArray());
$db->update('ng_auction', $this->info->toArrayExcept('id'), 'id = %i', $this->info->id);
return null;
}
@@ -184,23 +163,17 @@ class Auction
public function closeAuction(bool $isRollback = false): void
{
$db = DB::db();
$auctionStor = KVStorage::getStorage($db, 'auction');
$this->info->finished = true;
$openedAuction = $this->general->getAuxVar('openedAuction') ?? [];
if (key_exists($this->info->type->value, $openedAuction)) {
unset($openedAuction[$this->info->type->value]);
$this->general->setAuxVar('openedAuction', $openedAuction);
}
if ($isRollback) {
$highestBid = $this->getHighestBid();
if ($highestBid !== null) {
$this->refundBid($highestBid, "{$this->info->title} 경매가 취소되었습니다.");
}
}
$auctionID = $this->info->id;
$auctionStor->setValue("id_{$auctionID}", $this->info->toArray());
$db->update('ng_auction', $this->info->toArrayExcept('id'), 'id = %i', $this->info->id);
}
private function bidInheritPoint(int $amount, \DateTimeImmutable $now, bool $tryExtendCloseDate): ?string
hwe/sammo/AuctionUniqueItem.php
+21 -20
View File
@@ -5,6 +5,7 @@ namespace sammo;
use DateTimeImmutable;
use sammo\DTO\AuctionBidItem;
use sammo\DTO\AuctionInfo;
use sammo\DTO\AuctionInfoDetail;
use sammo\Enums\AuctionType;
use sammo\Enums\InheritanceKey;
use sammo\Enums\ResourceType;
@@ -44,7 +45,7 @@ class AuctionUniqueItem extends Auction
return "{$namePool[$subIdx]}{$dupIdx}";
}
static public function openItemAuction(BaseItem $item, General $general, int $startAmount): ?string
static public function openItemAuction(BaseItem $item, General $general, int $startAmount): self|string
{
if ($startAmount < GameConst::$inheritItemUniqueMinPoint) {
return '최소 경매 금액은 ' . GameConst::$inheritItemUniqueMinPoint . '입니다.';
@@ -58,9 +59,6 @@ class AuctionUniqueItem extends Auction
return '구매할 수 있는 아이템입니다.';
}
if (GameConst::$allItems)
$auctionID = static::genNextAuctionID();
$now = new DateTimeImmutable();
$db = DB::db();
@@ -75,25 +73,28 @@ class AuctionUniqueItem extends Auction
));
$info = new AuctionInfo(
$auctionID,
static::genObfuscatedName($general->getID()),
$general->getID(),
AuctionType::UniqueItem,
$item->getRawClassName(),
"{$item->getName()} 경매",
false,
ResourceType::inheritancePoint,
$startAmount,
null,
1,
AuctionType::UniqueItem,
false,
$item->getRawClassName(),
$general->getID(),
ResourceType::inheritancePoint,
$now,
$closeDate,
$availableLatestBidCloseDate,
new AuctionInfoDetail(
"{$item->getName()} 경매",
static::genObfuscatedName($general->getID()),
$startAmount,
null,
1,
$availableLatestBidCloseDate,
)
);
$result = static::openAuction($info, $general);
if ($result !== null) {
return $result;
$auctionID = static::openAuction($info, $general);
if (!is_int($auctionID)) {
return $auctionID;
}
$auction = new static($auctionID, $general);
try {
@@ -105,7 +106,7 @@ class AuctionUniqueItem extends Auction
return "경매를 시작했지만, 첫 입찰에 실패했습니다: {$msg}";
}
return null;
return $auction;
}
private function giveUniqueItem(AuctionBidItem $highestBid, General $bidder): ?string
@@ -137,7 +138,7 @@ class AuctionUniqueItem extends Auction
}
}
if($availableEquipUniqueCnt <= 0){
if ($availableEquipUniqueCnt <= 0) {
return '유니크 아이템 소유 제한 상태입니다. 종료 시간이 연장됩니다.';
}
hwe/sammo/DTO/AuctionInfo.php
+9 -10
View File
@@ -3,6 +3,8 @@
namespace sammo\DTO;
use sammo\DTO\Attr\Convert;
use sammo\DTO\Attr\JsonString;
use sammo\DTO\Attr\NullIsUndefined;
use sammo\DTO\Converter\DateTimeConverter;
use sammo\Enums\AuctionType;
use sammo\Enums\ResourceType;
@@ -10,24 +12,21 @@ use sammo\Enums\ResourceType;
class AuctionInfo extends DTO
{
public function __construct(
public int $id,
public string $openerName,
public int $openerGeneralID,
#[NullIsUndefined]
public ?int $id,
public AuctionType $type,
public ?string $target,
public string $title,
public bool $finished,
public ?string $target,
public int $openerGeneralID,
public ResourceType $reqResource,
public int $minAmount,
public ?int $buyImmediatelyAmount,
public ?int $remainCloseDateExtensionCnt,
#[Convert(DateTimeConverter::class)]
public \DateTimeImmutable $openDate,
#[Convert(DateTimeConverter::class)]
public \DateTimeImmutable $closeDate,
#[Convert(DateTimeConverter::class)]
public ?\DateTimeImmutable $availableLatestBidCloseDate,
#[JsonString]
public AuctionInfoDetail $detail,
) {
}
}
hwe/sammo/DTO/AuctionInfoDetail.php
+26
View File
@@ -0,0 +1,26 @@
<?php
namespace sammo\DTO;
use sammo\DTO\Attr\Convert;
use sammo\DTO\Attr\NullIsUndefined;
use sammo\DTO\Converter\DateTimeConverter;
class AuctionInfoDetail extends DTO
{
public function __construct(
public string $title,
public string $openerName,
public int $minAmount,
#[NullIsUndefined]
public ?int $buyImmediatelyAmount,
#[NullIsUndefined]
public ?int $remainCloseDateExtensionCnt,
#[NullIsUndefined]
#[Convert(DateTimeConverter::class)]
public ?\DateTimeImmutable $availableLatestBidCloseDate,
) {
}
}
hwe/sql/schema.sql
+15 -13
View File
@@ -692,21 +692,23 @@ CREATE TABLE `vote_comment` (
##############################
# 경매 객체는 KVStorage에 저장
CREATE TABLE `ng_auction` (
`no` INT(11) NOT NULL AUTO_INCREMENT,
`auction_id` INT(11) NOT NULL,
`owner` INT(11) NULL DEFAULT NULL,
`general_id` INT(11) NOT NULL,
`amount` INT(11) NOT NULL,
`date` DATETIME NOT NULL,
`aux` LONGTEXT NOT NULL COLLATE 'utf8mb4_bin',
PRIMARY KEY (`no`),
UNIQUE INDEX `by_general` (`general_id`, `auction_id`, `amount`),
UNIQUE INDEX `by_owner` (`owner`, `auction_id`, `amount`),
INDEX `by_amount` (`auction_id`, `amount`, `date`),
CONSTRAINT `aux` CHECK (json_valid(`aux`))
`id` INT(11) NOT NULL AUTO_INCREMENT,
`type` ENUM('gold','rice','uniqueItem') NOT NULL COLLATE 'utf8mb4_bin',
`finished` BIT(1) NOT NULL,
`target` VARCHAR(50) NULL DEFAULT NULL COLLATE 'utf8mb4_bin',
`opener_general_id` INT(11) NOT NULL,
`req_resource` ENUM('gold','rice','inheritPoint') NOT NULL COLLATE 'utf8mb4_bin',
`open_date` DATETIME NOT NULL,
`close_date` DATETIME NOT NULL,
`detail` LONGTEXT NOT NULL COLLATE 'utf8mb4_bin',
PRIMARY KEY (`id`) USING BTREE,
INDEX `by_close` (`finished`, `type`, `close_date`) USING BTREE,
INDEX `by_general_id` (`opener_general_id`, `type`, `finished`) USING BTREE,
CONSTRAINT `detail` CHECK (json_valid(`detail`))
)
COLLATE='utf8mb4_general_ci'
ENGINE = Aria;
ENGINE=Aria
;
CREATE TABLE `ng_auction_bid` (
`no` INT(11) NOT NULL AUTO_INCREMENT,