상시 프리렌더와 중복 예약 안내를 없애고, 검수된 발행 버전을 보존한다. 미리보기는 실제 렌더 완료까지 스피너를 표시한다. 사이트 81건, 발행·롤백·서치콘솔 45건, 프로세스 수명 3건 통과. 빌더·사이트 빌드 및 compose 설정 검증 통과.
290 lines
13 KiB
Python
290 lines
13 KiB
Python
from abc import ABC, abstractmethod
|
|
from typing import Tuple
|
|
|
|
from sqlalchemy import and_, func, select, update
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from common.database.db_session_manager import DB_SESSION_MNG
|
|
from common.database.model.models import places, site_publish_logs, site_versions, sites
|
|
from common.enums import BuildStatus, ErrorType, SiteStatus
|
|
from common.logger import LOG
|
|
from common.utils.gtime import GTime
|
|
|
|
|
|
# 사이트/버전/발행로그 CRUD. 항상 place_id 또는 site_id 로 스코프한다.
|
|
class ISiteCRUD(ABC):
|
|
@abstractmethod
|
|
async def get_site_by_place(self, cdb: AsyncSession, place_id) -> Tuple[ErrorType, sites]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def get_site_by_domain(self, cdb: AsyncSession, domain: str) -> Tuple[ErrorType, sites]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def list_owner_sites(self, cdb: AsyncSession, owner_user_id, skip, limit) -> Tuple[ErrorType, list, int]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def taken_domains(self, cdb: AsyncSession, domains: list) -> Tuple[ErrorType, set]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def add_site(self, cdb: AsyncSession, site: sites) -> ErrorType:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def next_version_no(self, cdb: AsyncSession, site_id) -> Tuple[ErrorType, int]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def add_version(self, cdb: AsyncSession, version: site_versions) -> ErrorType:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def get_version(self, cdb: AsyncSession, site_id, site_version_id) -> Tuple[ErrorType, site_versions]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def get_version_by_number(self, cdb: AsyncSession, site_id, version: int) -> Tuple[ErrorType, site_versions]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def finish_version(self, cdb: AsyncSession, site_version_id, data: dict) -> Tuple[ErrorType, int]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def update_site(self, cdb: AsyncSession, site_id, data: dict) -> Tuple[ErrorType, int]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def add_log(self, cdb: AsyncSession, log: site_publish_logs) -> ErrorType:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def list_logs(self, cdb: AsyncSession, site_id, limit: int) -> Tuple[ErrorType, list]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def list_published(self, cdb: AsyncSession, limit: int) -> Tuple[ErrorType, list]:
|
|
pass
|
|
|
|
|
|
class SiteCRUD(ISiteCRUD):
|
|
async def get_site_by_place(self, cdb: AsyncSession, place_id) -> Tuple[ErrorType, sites]:
|
|
try:
|
|
query = select(sites).where(sites.place_id == place_id, sites.deleted == False).limit(1) # noqa: E712
|
|
err_type, rows = await DB_SESSION_MNG.execute(cdb, query)
|
|
if err_type != ErrorType.SUCCESS:
|
|
return err_type, None
|
|
return ErrorType.SUCCESS, (rows[0] if rows else None)
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, None
|
|
|
|
async def get_site_by_domain(self, cdb: AsyncSession, domain: str) -> Tuple[ErrorType, sites]:
|
|
"""주소(도메인 라벨)의 주인을 찾는다. 없으면 (SUCCESS, None).
|
|
|
|
uq_sites_domain(deleted=false AND domain IS NOT NULL)과 같은 조건으로 본다 —
|
|
인덱스가 막는 것과 조회가 막는 것이 다르면 "확인은 통과, 저장은 실패"가 난다."""
|
|
try:
|
|
query = select(sites).where(sites.domain == domain, sites.deleted == False).limit(1) # noqa: E712
|
|
err_type, rows = await DB_SESSION_MNG.execute(cdb, query)
|
|
if err_type != ErrorType.SUCCESS:
|
|
return err_type, None
|
|
return ErrorType.SUCCESS, (rows[0] if rows else None)
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, None
|
|
|
|
async def list_owner_sites(self, cdb: AsyncSession, owner_user_id, skip: int, limit: int) -> Tuple[ErrorType, list, int]:
|
|
"""사장님의 사업장 + 사이트 + 마지막 빌드 시각. (ErrorType, [(place, site, built_at)], 총건수).
|
|
|
|
따로 읽으면 줄마다 사이트를 다시 물어 N+1 이다. LEFT JOIN 이라 사이트가 없는 사업장
|
|
(위저드만 걸어온 것)도 내려간다 — 빠지면 만들다 만 것을 찾을 길이 없다."""
|
|
try:
|
|
where = and_(places.deleted == False, places.owner_user_id == owner_user_id) # noqa: E712
|
|
|
|
cnt_err, cnt_rows = await DB_SESSION_MNG.execute(cdb, select(func.count()).select_from(places).where(where))
|
|
if cnt_err != ErrorType.SUCCESS:
|
|
return cnt_err, [], 0
|
|
total = int(cnt_rows[0] or 0) if cnt_rows else 0
|
|
|
|
query = (
|
|
select(places, sites, site_versions.built_at)
|
|
.outerjoin(sites, and_(sites.place_id == places.place_id, sites.deleted == False)) # noqa: E712
|
|
.outerjoin(site_versions, site_versions.site_version_id == sites.current_version_id)
|
|
.where(where)
|
|
.order_by(places.created_at.desc())
|
|
.offset(skip)
|
|
.limit(limit)
|
|
)
|
|
list_err, rows = await DB_SESSION_MNG.execute(cdb, query)
|
|
if list_err != ErrorType.SUCCESS:
|
|
return list_err, [], 0
|
|
return ErrorType.SUCCESS, list(rows), total
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, [], 0
|
|
|
|
async def taken_domains(self, cdb: AsyncSession, domains: list) -> Tuple[ErrorType, set]:
|
|
"""후보 주소들 중 이미 쓰이는 것만 추린다. 대안 제안이 후보마다 왕복하지 않게 한 번에 본다."""
|
|
try:
|
|
if not domains:
|
|
return ErrorType.SUCCESS, set()
|
|
query = select(sites.domain).where(
|
|
sites.domain.in_(domains), sites.deleted == False # noqa: E712
|
|
)
|
|
err_type, rows = await DB_SESSION_MNG.execute(cdb, query)
|
|
if err_type != ErrorType.SUCCESS:
|
|
return err_type, set()
|
|
return ErrorType.SUCCESS, {r for r in rows if r}
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, set()
|
|
|
|
async def add_site(self, cdb: AsyncSession, site: sites) -> ErrorType:
|
|
try:
|
|
return await DB_SESSION_MNG.insert(cdb, site)
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED
|
|
|
|
async def next_version_no(self, cdb: AsyncSession, site_id) -> Tuple[ErrorType, int]:
|
|
"""다음 버전 번호. 1부터 시작한다."""
|
|
try:
|
|
query = select(func.max(site_versions.version)).where(
|
|
site_versions.site_id == site_id, site_versions.deleted == False # noqa: E712
|
|
)
|
|
err_type, rows = await DB_SESSION_MNG.execute(cdb, query)
|
|
if err_type != ErrorType.SUCCESS:
|
|
return err_type, 0
|
|
current = rows[0] if rows else None
|
|
return ErrorType.SUCCESS, int(current or 0) + 1
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, 0
|
|
|
|
async def add_version(self, cdb: AsyncSession, version: site_versions) -> ErrorType:
|
|
try:
|
|
return await DB_SESSION_MNG.insert(cdb, version)
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED
|
|
|
|
async def get_version(self, cdb: AsyncSession, site_id, site_version_id) -> Tuple[ErrorType, site_versions]:
|
|
try:
|
|
query = (
|
|
select(site_versions)
|
|
.where(
|
|
site_versions.site_version_id == site_version_id,
|
|
site_versions.site_id == site_id,
|
|
site_versions.deleted == False, # noqa: E712
|
|
)
|
|
.limit(1)
|
|
)
|
|
err_type, rows = await DB_SESSION_MNG.execute(cdb, query)
|
|
if err_type != ErrorType.SUCCESS:
|
|
return err_type, None
|
|
if len(rows) != 1:
|
|
return ErrorType.DB_INVALID_KEY, None
|
|
return ErrorType.SUCCESS, rows[0]
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, None
|
|
|
|
async def get_version_by_number(self, cdb: AsyncSession, site_id, version: int) -> Tuple[ErrorType, site_versions]:
|
|
"""롤백 대상 조회 — site_versions.version(사람이 보는 번호) 로 찾는다.
|
|
|
|
★ site_version_id(uuid) 가 아니다. 화면·API 는 버전 번호로 고르는 게 자연스럽고,
|
|
그 번호가 곧 out/versions/<slug>/<version>/ 디렉토리 이름이다(prerender.ts)."""
|
|
try:
|
|
query = (
|
|
select(site_versions)
|
|
.where(
|
|
site_versions.site_id == site_id,
|
|
site_versions.version == version,
|
|
site_versions.deleted == False, # noqa: E712
|
|
)
|
|
.limit(1)
|
|
)
|
|
err_type, rows = await DB_SESSION_MNG.execute(cdb, query)
|
|
if err_type != ErrorType.SUCCESS:
|
|
return err_type, None
|
|
if len(rows) != 1:
|
|
return ErrorType.DB_INVALID_KEY, None
|
|
return ErrorType.SUCCESS, rows[0]
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, None
|
|
|
|
async def finish_version(self, cdb: AsyncSession, site_version_id, data: dict) -> Tuple[ErrorType, int]:
|
|
"""빌드 결과를 버전에 기록한다(BUILT 또는 FAILED)."""
|
|
try:
|
|
query = (
|
|
update(site_versions)
|
|
.where(site_versions.site_version_id == site_version_id, site_versions.deleted == False) # noqa: E712
|
|
.values(**data, updated_at=GTime.UTC())
|
|
)
|
|
return await DB_SESSION_MNG.add_with_rowcount(cdb, query)
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, 0
|
|
|
|
async def update_site(self, cdb: AsyncSession, site_id, data: dict) -> Tuple[ErrorType, int]:
|
|
try:
|
|
query = (
|
|
update(sites)
|
|
.where(sites.site_id == site_id, sites.deleted == False) # noqa: E712
|
|
.values(**data, updated_at=GTime.UTC())
|
|
)
|
|
return await DB_SESSION_MNG.add_with_rowcount(cdb, query)
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, 0
|
|
|
|
async def add_log(self, cdb: AsyncSession, log: site_publish_logs) -> ErrorType:
|
|
try:
|
|
return await DB_SESSION_MNG.insert(cdb, log)
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED
|
|
|
|
async def list_logs(self, cdb: AsyncSession, site_id, limit: int = 50) -> Tuple[ErrorType, list]:
|
|
try:
|
|
query = (
|
|
select(site_publish_logs)
|
|
.where(site_publish_logs.site_id == site_id, site_publish_logs.deleted == False) # noqa: E712
|
|
.order_by(site_publish_logs.created_at.desc())
|
|
.limit(limit)
|
|
)
|
|
err_type, rows = await DB_SESSION_MNG.execute(cdb, query)
|
|
return (err_type, list(rows) if err_type == ErrorType.SUCCESS else [])
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, []
|
|
|
|
async def list_published(self, cdb: AsyncSession, limit: int = 12) -> Tuple[ErrorType, list]:
|
|
"""발행된 사이트 + 그 사업장을 최신순으로. 랜딩 쇼케이스가 읽는 목록이다.
|
|
|
|
★ 회사 스코프가 없는 **유일한** 사이트 조회다(비로그인 API 가 쓴다). 그래서 행을 통째로
|
|
돌려주고, 무엇이 밖으로 나갈지는 services/showcase_service 한 곳에서만 고른다 —
|
|
여기서 열을 골라 두면 나중에 필드를 늘릴 때 공개 여부를 판단할 자리가 사라진다."""
|
|
try:
|
|
query = (
|
|
select(sites, places)
|
|
.join(places, places.place_id == sites.place_id)
|
|
.where(
|
|
sites.status == SiteStatus.PUBLISHED.value,
|
|
sites.deleted == False, # noqa: E712
|
|
places.deleted == False, # noqa: E712
|
|
)
|
|
.order_by(sites.published_at.desc().nulls_last(), sites.created_at.desc())
|
|
.limit(limit)
|
|
)
|
|
err_type, rows = await DB_SESSION_MNG.execute(cdb, query)
|
|
return (err_type, list(rows) if err_type == ErrorType.SUCCESS else [])
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, []
|