Mina Choi
64ce467f21
도메인별 스키마(company·place·fact·local·site·job)를 걷어내고 public 한 벌로 폈다.
스키마 한정자가 붙은 순간부터 ORM·raw SQL·테스트 픽스처가 각자 그 이름을 들고 다녀야 했다.
- 공용 콘텐츠를 한 테이블로 되돌린다. spots·region_stories 를 따로 파 놓고 보니
같은 성격이 세 곳으로 갈라져 있었다 — `area_contents` 가 처음부터 content_type 으로
종류를 가르는 설계였고 그걸 쓰면 됐다. 관계(거리·숨김)만 `place_area_refs` 로 남긴다.
- migrations/ + scripts/migrate.py: `init.sql` 은 **DB 를 처음 만들 때만** 돈다. 파일에
컬럼을 더해도 이미 데이터가 든 DB 에는 반영되지 않는다 — 실제로 TourAPI 가 주변 정보를
받아 와도 저장할 곳이 없어 축제·맛집이 0건이었고, 화면에는 "그냥 안 나오는 것" 으로만 보였다.
DECISIONS.md 가 예고한 그대로다("운영 DB 가 생기는 순간 다시 필요해진다").
Alembic 을 쓰지 않는 이유는 스키마 정의가 이미 두 곳(ORM·init.sql)이라 세 번째를
더하면 어긋날 자리가 하나 더 생기기 때문이다.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
279 lines
12 KiB
Python
279 lines
12 KiB
Python
from abc import ABC, abstractmethod
|
|
from typing import Optional, Tuple
|
|
|
|
from sqlalchemy import and_, delete, func, or_, select, update
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from common.database.db_session_manager import DB_SESSION_MNG
|
|
from common.database.model.models import place_channels, places, place_units
|
|
from common.enums import ErrorType
|
|
from common.logger import LOG
|
|
from common.utils.gtime import GTime
|
|
|
|
|
|
# 사업장 CRUD. 모든 조회는 owner_user_id(사장님)로 스코프한다 — 남의 가게가 보이면 안 된다.
|
|
class IPlaceCRUD(ABC):
|
|
@abstractmethod
|
|
async def add_place(self, cdb: AsyncSession, place: places) -> ErrorType:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def get_place(self, cdb: AsyncSession, owner_user_id, place_id) -> Tuple[ErrorType, places]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def list_places(self, cdb: AsyncSession, owner_user_id, search, category, status, skip, limit) -> Tuple[ErrorType, list, int]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def update_place(self, cdb: AsyncSession, owner_user_id, place_id, data: dict) -> Tuple[ErrorType, int]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def delete_place(self, cdb: AsyncSession, owner_user_id, place_id) -> Tuple[ErrorType, int]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def list_units(self, cdb: AsyncSession, place_id) -> Tuple[ErrorType, list]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def get_unit(self, cdb: AsyncSession, place_id, unit_id) -> Tuple[ErrorType, place_units]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def add_unit(self, cdb: AsyncSession, unit: place_units) -> ErrorType:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def list_links(self, cdb: AsyncSession, place_id, confirmed_only: bool) -> Tuple[ErrorType, list]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def add_link(self, cdb: AsyncSession, link: place_channels) -> ErrorType:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def confirm_link(self, cdb: AsyncSession, place_id, link_id, user_id, ts) -> Tuple[ErrorType, int]:
|
|
pass
|
|
|
|
async def confirm_link_by_url(self, cdb: AsyncSession, place_id, url, user_id, ts) -> Tuple[ErrorType, int]:
|
|
pass
|
|
|
|
@abstractmethod
|
|
async def set_link_raw(self, cdb: AsyncSession, place_id, url, raw) -> Tuple[ErrorType, int]:
|
|
pass
|
|
|
|
|
|
class PlaceCRUD(IPlaceCRUD):
|
|
async def add_place(self, cdb: AsyncSession, place: places) -> ErrorType:
|
|
try:
|
|
return await DB_SESSION_MNG.insert(cdb, place)
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED
|
|
|
|
async def get_place(self, cdb: AsyncSession, owner_user_id, place_id) -> Tuple[ErrorType, places]:
|
|
try:
|
|
query = (
|
|
select(places)
|
|
.where(places.place_id == place_id, places.owner_user_id == owner_user_id, places.deleted == False) # noqa: E712
|
|
.limit(1)
|
|
)
|
|
err_type, row_list = await DB_SESSION_MNG.execute(cdb, query)
|
|
if err_type != ErrorType.SUCCESS:
|
|
return err_type, None
|
|
if len(row_list) != 1:
|
|
return ErrorType.DB_INVALID_KEY, None
|
|
return ErrorType.SUCCESS, row_list[0]
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, None
|
|
|
|
async def list_places(
|
|
self, cdb: AsyncSession, owner_user_id, search: Optional[str], category: Optional[int],
|
|
status: Optional[int], skip: int, limit: int,
|
|
) -> Tuple[ErrorType, list, int]:
|
|
try:
|
|
conditions = [places.deleted == False, places.owner_user_id == owner_user_id] # noqa: E712
|
|
if category is not None:
|
|
conditions.append(places.category == category)
|
|
if status is not None:
|
|
conditions.append(places.status == status)
|
|
if search:
|
|
conditions.append(
|
|
or_(
|
|
places.name.ilike(f"%{search}%"),
|
|
places.road_address.ilike(f"%{search}%"),
|
|
places.address.ilike(f"%{search}%"),
|
|
)
|
|
)
|
|
where = and_(*conditions)
|
|
|
|
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
|
|
|
|
list_err, rows = await DB_SESSION_MNG.execute(
|
|
cdb,
|
|
select(places).where(where).order_by(places.created_at.desc()).offset(skip).limit(limit),
|
|
)
|
|
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 update_place(self, cdb: AsyncSession, owner_user_id, place_id, data: dict) -> Tuple[ErrorType, int]:
|
|
"""회사 스코프를 WHERE 에 걸어 남의 회사 사업장을 못 건드리게 한다. (ErrorType, 적용행수)."""
|
|
try:
|
|
if not data:
|
|
return ErrorType.SUCCESS, 0
|
|
query = (
|
|
update(places)
|
|
.where(places.place_id == place_id, places.owner_user_id == owner_user_id, places.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 delete_place(self, cdb: AsyncSession, owner_user_id, place_id) -> Tuple[ErrorType, int]:
|
|
"""사업장을 실제 삭제한다. 회사 스코프 밖의 행은 건드리지 않는다."""
|
|
try:
|
|
query = (
|
|
delete(places)
|
|
.where(places.place_id == place_id, places.owner_user_id == owner_user_id, places.deleted == False) # noqa: E712
|
|
)
|
|
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 list_units(self, cdb: AsyncSession, place_id) -> Tuple[ErrorType, list]:
|
|
try:
|
|
query = (
|
|
select(place_units)
|
|
.where(place_units.place_id == place_id, place_units.deleted == False) # noqa: E712
|
|
.order_by(place_units.sort_order.asc(), place_units.created_at.asc())
|
|
)
|
|
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 get_unit(self, cdb: AsyncSession, place_id, unit_id) -> Tuple[ErrorType, place_units]:
|
|
try:
|
|
query = (
|
|
select(place_units)
|
|
.where(place_units.unit_id == unit_id, place_units.place_id == place_id, place_units.deleted == False) # noqa: E712
|
|
.limit(1)
|
|
)
|
|
err_type, row_list = await DB_SESSION_MNG.execute(cdb, query)
|
|
if err_type != ErrorType.SUCCESS:
|
|
return err_type, None
|
|
if len(row_list) != 1:
|
|
return ErrorType.DB_INVALID_KEY, None
|
|
return ErrorType.SUCCESS, row_list[0]
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED, None
|
|
|
|
async def add_unit(self, cdb: AsyncSession, unit: place_units) -> ErrorType:
|
|
try:
|
|
return await DB_SESSION_MNG.insert(cdb, unit)
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED
|
|
|
|
async def list_links(self, cdb: AsyncSession, place_id, confirmed_only: bool = False) -> Tuple[ErrorType, list]:
|
|
"""채널 URL 목록. confirmed_only=True 면 ★ 크롤링 대상(확정된 URL)만."""
|
|
try:
|
|
conditions = [place_channels.place_id == place_id, place_channels.deleted == False] # noqa: E712
|
|
if confirmed_only:
|
|
conditions.append(place_channels.confirmed_at.is_not(None))
|
|
query = select(place_channels).where(and_(*conditions)).order_by(place_channels.discovered_at.asc())
|
|
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 add_link(self, cdb: AsyncSession, link: place_channels) -> ErrorType:
|
|
try:
|
|
return await DB_SESSION_MNG.insert(cdb, link)
|
|
except Exception as ex:
|
|
LOG.e_no_callstack(ex)
|
|
return ErrorType.DB_RUN_FAILED
|
|
|
|
async def confirm_link_by_url(self, cdb: AsyncSession, place_id, url, user_id, ts) -> Tuple[ErrorType, int]:
|
|
"""URL 로 확정한다 — 방금 넣은 링크의 link_id 를 다시 조회하지 않기 위해서다.
|
|
|
|
(place_id, url) 은 유니크라 대상이 한 건으로 정해진다. 이미 확정된 건 rowcount 0.
|
|
★ 쓰는 곳은 상호 일치로 찾은 네이버 플레이스 링크 하나뿐이다 — 근거 없이 확정하는
|
|
경로를 늘리지 않으려고 일부러 좁게 열어 둔다(collect_service.discover_naver_place)."""
|
|
try:
|
|
query = (
|
|
update(place_channels)
|
|
.where(
|
|
place_channels.place_id == place_id,
|
|
place_channels.url == url,
|
|
place_channels.confirmed_at.is_(None),
|
|
place_channels.deleted == False, # noqa: E712
|
|
)
|
|
.values(confirmed_at=ts, confirmed_by=user_id, updated_at=ts)
|
|
)
|
|
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 set_link_raw(self, cdb: AsyncSession, place_id, url, raw) -> Tuple[ErrorType, int]:
|
|
"""수집한 원문을 링크에 박제한다.
|
|
|
|
★ 왜 fact 가 아니라 여기인가 (2026-08-31)
|
|
TourAPI 의 `overview` 같은 소개 원문은 **사실 목록이 아니라 글**이다.
|
|
이걸 `intro` fact 로 넣었더니 457자 원문이 그대로 VERIFIED 가 되어
|
|
사장님 사이트의 '숙소 소개' 자리를 차지했다 — LLM 이 쓴 소개문은 뒤에서 대기 중인데.
|
|
`intro` 는 allow_llm=True, 즉 **LLM 의 출력 칸**이라 수집물이 들어가면 안 된다.
|
|
|
|
그렇다고 버리면 소개문·FAQ 의 근거가 사라진다(부대시설·주변 거리 같은 정보가
|
|
여기에만 있다). 그래서 **발행되지 않는 자리**에 원문을 남기고,
|
|
생성 시점에만 근거로 넘긴다(services/copy_service.py)."""
|
|
try:
|
|
query = (
|
|
update(place_channels)
|
|
.where(
|
|
place_channels.place_id == place_id,
|
|
place_channels.url == url,
|
|
place_channels.deleted == False, # noqa: E712
|
|
)
|
|
.values(raw=raw, 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 confirm_link(self, cdb: AsyncSession, place_id, link_id, user_id, ts) -> Tuple[ErrorType, int]:
|
|
"""미확정 링크만 확정한다(이미 확정된 건 rowcount 0 — 동시 처리 가드)."""
|
|
try:
|
|
query = (
|
|
update(place_channels)
|
|
.where(
|
|
place_channels.link_id == link_id,
|
|
place_channels.place_id == place_id,
|
|
place_channels.confirmed_at.is_(None),
|
|
place_channels.deleted == False, # noqa: E712
|
|
)
|
|
.values(confirmed_at=ts, confirmed_by=user_id, updated_at=ts)
|
|
)
|
|
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
|