✨ feat: create jmy data

Author: Zerohertz

alembic/env.py

@@ -6,7 +6,7 @@
 from alembic import context
 from app.core.configs import configs
 from app.core.database import database
-from app.models.base import BaseModel
+from app.models import BaseModel
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.

alembic/versions/7d6aa6eaf640_feat_jmy.py

@@ -0,0 +1,58 @@
+"""feat: jmy
+
+Revision ID: 7d6aa6eaf640
+Revises: 0bdf3abd5213
+Create Date: 2025-03-05 00:15:09.139612
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '7d6aa6eaf640'
+down_revision: Union[str, None] = '0bdf3abd5213'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('jmy_company',
+    sa.Column('name', sa.String(length=255), nullable=False),
+    sa.Column('year', sa.Integer(), nullable=False),
+    sa.Column('location', sa.String(length=255), nullable=False),
+    sa.Column('address', sa.String(length=255), nullable=False),
+    sa.Column('type', sa.String(length=255), nullable=False),
+    sa.Column('size', sa.String(length=255), nullable=False),
+    sa.Column('research', sa.String(length=255), nullable=True),
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
+    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('jmy_time_series',
+    sa.Column('company_id', sa.Integer(), nullable=False),
+    sa.Column('date', sa.DateTime(timezone=True), nullable=False),
+    sa.Column('b_assigned', sa.Integer(), nullable=False),
+    sa.Column('b_new', sa.Integer(), nullable=False),
+    sa.Column('b_old', sa.Integer(), nullable=False),
+    sa.Column('a_assigned', sa.Integer(), nullable=False),
+    sa.Column('a_new', sa.Integer(), nullable=False),
+    sa.Column('a_old', sa.Integer(), nullable=False),
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
+    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=False),
+    sa.ForeignKeyConstraint(['company_id'], ['jmy_company.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('jmy_time_series')
+    op.drop_table('jmy_company')
+    # ### end Alembic commands ###

app/api/v1/endpoints/admin/jmy.py

@@ -0,0 +1,53 @@
+from dependency_injector.wiring import Provide, inject
+from fastapi import Depends, status
+from fastapi.responses import ORJSONResponse
+
+from app.core.auth import (
+    AdminAuthDeps,
+    GitHubOAuthDeps,
+    GoogleOAuthDeps,
+    PasswordOAuthDeps,
+)
+from app.core.container import Container
+from app.core.router import CoreAPIRouter
+from app.schemas.jmy import JmyCompanyOut, JmyCompanyRequest
+from app.services.jmy import JmyService
+
+router = CoreAPIRouter(
+    prefix="/jmy",
+    tags=["admin"],
+    dependencies=[AdminAuthDeps, PasswordOAuthDeps, GoogleOAuthDeps, GitHubOAuthDeps],
+)
+
+
+@router.post(
+    "",
+    response_model=JmyCompanyOut,
+    response_class=ORJSONResponse,
+    status_code=status.HTTP_200_OK,
+    summary="",
+    description="",
+)
+@inject
+async def create_jmy(
+    schema: JmyCompanyRequest,
+    service: JmyService = Depends(Provide[Container.jmy_service]),
+):
+    return await service.create(schema)
+
+
+# TODO: 회사 명을 통해 데이터 조회
+# @router.get(
+#     "",
+#     response_model=JmyCompanyOut,
+#     response_class=ORJSONResponse,
+#     status_code=status.HTTP_200_OK,
+#     summary="",
+#     description="",
+# )
+# @inject
+# async def get_jmy(
+#     name: str,
+#     service: JmyService = Depends(Provide[Container.jmy_service]),
+# ):
+#     return await service.get_by_id(name)

app/api/v1/routers.py

@@ -1,10 +1,14 @@
 from fastapi import APIRouter
 
 from app.api.v1.endpoints import auth, shields, users
+from app.api.v1.endpoints.admin import jmy as admin_jmy
 from app.api.v1.endpoints.admin import users as admin_users
 
 routers = APIRouter(prefix="/v1", tags=["v1"])
-_routers = [auth.router, users.router, shields.router] + [admin_users.router]
+_routers = [auth.router, users.router, shields.router] + [
+    admin_users.router,
+    admin_jmy.router,
+]
 
 for _router in _routers:
     routers.include_router(_router)

app/core/container.py

@@ -2,8 +2,10 @@
 from dependency_injector.providers import Factory
 
 from app.repositories.auth import AuthRepository
+from app.repositories.jmy import JmyRepository
 from app.repositories.users import UserRepository
 from app.services.auth import AuthService, JwtService
+from app.services.jmy import JmyService
 from app.services.security import CryptService
 from app.services.users import UserService
 
@@ -15,11 +17,13 @@ class Container(DeclarativeContainer):
             "app.api.v1.endpoints.users",
             "app.api.v1.endpoints.auth",
             "app.api.v1.endpoints.admin.users",
+            "app.api.v1.endpoints.admin.jmy",
         ]
     )
 
     user_repository = Factory(UserRepository)
     auth_repository = Factory(AuthRepository)
+    jmy_repository = Factory(JmyRepository)
 
     jwt_service = Factory(JwtService)
     crypt_service = Factory(CryptService)
@@ -31,3 +35,4 @@ class Container(DeclarativeContainer):
         jwt_service=jwt_service,
         crypt_service=crypt_service,
     )
+    jmy_service = Factory(JmyService, jmy_repository=jmy_repository)

app/models/__init__.py

@@ -0,0 +1,15 @@
+from app.models.auth import OAuth
+from app.models.base import BaseModel
+from app.models.enums import OAuthProvider, Role
+from app.models.jmy import JmyCompany, JmyTimeSeries
+from app.models.users import User
+
+__all__ = [
+    "BaseModel",
+    "User",
+    "OAuth",
+    "Role",
+    "OAuthProvider",
+    "JmyCompany",
+    "JmyTimeSeries",
+]

app/models/jmy.py

@@ -0,0 +1,65 @@
+from datetime import datetime
+
+from sqlalchemy import (
+    DateTime,
+    ForeignKey,
+    Integer,
+    String,
+)
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.models.base import BaseModel
+
+
+class JmyCompany(BaseModel):
+    __tablename__ = "jmy_company"
+
+    # 업체명
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
+    # 선정년도
+    year: Mapped[int] = mapped_column(Integer, nullable=False)
+    # 지방청
+    location: Mapped[str] = mapped_column(String(255), nullable=False)
+    # 주소
+    address: Mapped[str] = mapped_column(String(255), nullable=False)
+    # 업종
+    type_: Mapped[str] = mapped_column("type", String(255), nullable=False)
+    # 기업규모
+    size: Mapped[str] = mapped_column(String(255), nullable=False)
+    # 연구분야
+    research: Mapped[str] = mapped_column(String(255), nullable=True)
+
+    time_series = relationship(
+        "JmyTimeSeries",
+        back_populates="company",
+        cascade="all, delete-orphan",
+        lazy="selectin",
+    )
+
+    eagers = ["time_series"]
+
+
+class JmyTimeSeries(BaseModel):
+    __tablename__ = "jmy_time_series"
+
+    company_id: Mapped[int] = mapped_column(
+        ForeignKey("jmy_company.id"), nullable=False
+    )
+
+    date: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
+    # 보충역 배정인원
+    b_assigned: Mapped[int] = mapped_column(Integer, nullable=False)
+    # 보충역 편입인원
+    b_new: Mapped[int] = mapped_column(Integer, nullable=False)
+    # 보충역 복무인원
+    b_old: Mapped[int] = mapped_column(Integer, nullable=False)
+    # 현역 배정인원
+    a_assigned: Mapped[int] = mapped_column(Integer, nullable=False)
+    # 현역 편입인원
+    a_new: Mapped[int] = mapped_column(Integer, nullable=False)
+    # 현역 복무인원
+    a_old: Mapped[int] = mapped_column(Integer, nullable=False)
+
+    company = relationship("JmyCompany", back_populates="time_series", lazy="noload")
+
+    eagers = ["company"]

app/repositories/jmy.py

@@ -0,0 +1,20 @@
+from sqlalchemy import select
+
+from app.core.database import database
+from app.models.jmy import JmyCompany
+from app.repositories.base import BaseRepository
+
+
+class JmyRepository(BaseRepository[JmyCompany]):
+    def __init__(self):
+        super().__init__(model=JmyCompany)
+
+    async def read_by_name(self, name: str, eager: bool = False) -> JmyCompany:
+        stmt = select(self.model)
+        if eager:
+            stmt = self._eager(stmt=stmt)
+        stmt = stmt.where(self.model.name == name)
+        session = database.scoped_session()
+        result = await session.execute(stmt)
+        entity = result.scalar_one_or_none()
+        return entity

app/schemas/jmy.py

@@ -0,0 +1,44 @@
+from datetime import datetime
+
+from app.schemas.base import BaseRequest, BaseResponse
+
+
+class JmyCompanyRequest(BaseRequest):
+    name: str
+    year: int
+    location: str
+    address: str
+    type_: str
+    size: str
+    research: str
+    date: datetime
+    b_assigned: int
+    b_new: int
+    b_old: int
+    a_assigned: int
+    a_new: int
+    a_old: int
+
+
+class JmyCompanyResponse(BaseResponse):
+    name: str
+    year: int
+    location: str
+    address: str
+    type_: str
+    size: str
+    research: str
+
+
+class JmyTimeSeriesOut(BaseResponse):
+    date: datetime
+    b_assigned: int
+    b_new: int
+    b_old: int
+    a_assigned: int
+    a_new: int
+    a_old: int
+
+
+class JmyCompanyOut(JmyCompanyResponse):
+    time_series: list[JmyTimeSeriesOut]

app/services/jmy.py

@@ -0,0 +1,38 @@
+from app.core.database import database
+from app.models.jmy import JmyCompany, JmyTimeSeries
+from app.repositories.jmy import JmyRepository
+from app.schemas.jmy import JmyCompanyOut, JmyCompanyRequest
+from app.services.base import BaseService
+
+
+class JmyService(BaseService[JmyCompany, JmyCompanyRequest, JmyCompanyOut]):
+    def __init__(self, jmy_repository: JmyRepository):
+        super().__init__(repository=jmy_repository, schema=JmyCompanyOut)
+        self.repository: jmy_repository
+
+    @database.transactional
+    async def create(self, schema: JmyCompanyRequest) -> JmyCompanyOut:
+        jmy_company = await self.repository.read_by_name(name=schema.name)
+        if jmy_company is None:
+            jmy_company = JmyCompany(
+                name=schema.name,
+                year=schema.year,
+                location=schema.location,
+                address=schema.address,
+                type_=schema.type_,
+                size=schema.size,
+                research=schema.research,
+            )
+        jmy_company.time_series.append(
+            JmyTimeSeries(
+                date=schema.date,
+                b_assigned=schema.b_assigned,
+                b_new=schema.b_new,
+                b_old=schema.b_old,
+                a_assigned=schema.a_assigned,
+                a_new=schema.a_new,
+                a_old=schema.a_old,
+            )
+        )
+        entity = await self.repository.create(entity=jmy_company)
+        return self.mapper(entity)