Added grand graph

Author: narumi147

app/core/nice/class_board.py

@@ -214,7 +214,7 @@ async def get_nice_class_board(
         condType=COND_TYPE_NAME[mstClassBoardBase.condType],
         condTargetId=mstClassBoardBase.condTargetId,
         condNum=mstClassBoardBase.condNum,
-        parentClassBoardBaseId=mstClassBoardBase.parentClassBoardBaseId,
+        parentClassBoardBaseId=mstClassBoardBase.parentClassBoardBaseId or 0,
         classes=[
             get_nice_class_board_class(class_board_class)
             for class_board_class in raw_class_board.mstClassBoardClass

app/core/nice/grand_graph.py

@@ -0,0 +1,74 @@
+from sqlalchemy.ext.asyncio import AsyncConnection
+
+from ...config import Settings
+from ...schemas.common import Language, Region
+from ...schemas.enums import get_class_name
+from ...schemas.gameenums import COND_TYPE_NAME
+from ...schemas.nice import NiceGrandGraph, NiceGrandGraphDetail
+from ...schemas.raw import MstGrandGraph, MstGrandGraphDetail
+from .. import raw
+from .item import get_nice_item_amount, get_nice_item_from_raw
+
+
+settings = Settings()
+
+
+def get_nice_grand_graph_detail(detail: MstGrandGraphDetail) -> NiceGrandGraphDetail:
+    return NiceGrandGraphDetail(
+        baseClassId=detail.baseClassId,
+        grandClassId=detail.grandClassId,
+        baseClass=get_class_name(detail.baseClassId),
+        grandClass=get_class_name(detail.grandClassId),
+        adjustHp=detail.adjustHp,
+        adjustAtk=detail.adjustAtk,
+        condType=COND_TYPE_NAME[detail.condType],
+        condTargetId=detail.condTargetId,
+        condNum=detail.condNum,
+    )
+
+
+async def get_nice_grand_graph(
+    conn: AsyncConnection, region: Region, grand_graph_id: int, lang: Language
+) -> NiceGrandGraph:
+    raw_grand_graph = await raw.get_grand_graph_entity(conn, grand_graph_id)
+
+    mstGrandGraph = raw_grand_graph.mstGrandGraph
+
+    items_map = {item.id: item for item in raw_grand_graph.mstItem}
+
+    return NiceGrandGraph(
+        id=mstGrandGraph.id,
+        name=mstGrandGraph.name,
+        nameShort=mstGrandGraph.nameShort,
+        nameShortEnglish=mstGrandGraph.nameShortEnglish,
+        classBoardBaseId=mstGrandGraph.classBoardBaseId,
+        condSvtLv=mstGrandGraph.condSvtLv,
+        condSkillLv=mstGrandGraph.condSkillLv,
+        condType=COND_TYPE_NAME[mstGrandGraph.condType],
+        condTargetId=mstGrandGraph.condTargetId,
+        condNum=mstGrandGraph.condNum,
+        removeItems=get_nice_item_amount(
+            [
+                get_nice_item_from_raw(region, items_map[itemId], lang)
+                for itemId in mstGrandGraph.removeItemIds
+            ],
+            mstGrandGraph.removeItemNums,
+        ),
+        details=[
+            get_nice_grand_graph_detail(detail)
+            for detail in raw_grand_graph.mstGrandGraphDetail
+            if detail.grandGraphId == mstGrandGraph.id
+        ],
+    )
+
+
+async def get_all_nice_grand_graphs(
+    conn: AsyncConnection,
+    region: Region,
+    mstGrandGraphs: list[MstGrandGraph],
+    lang: Language,
+) -> list[NiceGrandGraph]:  # pragma: no cover
+    return [
+        await get_nice_grand_graph(conn, region, mstGrandGraph.id, lang)
+        for mstGrandGraph in mstGrandGraphs
+    ]

app/core/raw.py

@@ -52,6 +52,7 @@
     FunctionEntity,
     FunctionEntityNoReverse,
     GachaEntity,
+    GrandGraphEntity,
     ItemEntity,
     MasterMissionEntity,
     MstBattleMasterImage,
@@ -131,6 +132,8 @@
     MstFuncGroup,
     MstGift,
     MstGiftAdd,
+    MstGrandGraph,
+    MstGrandGraphDetail,
     MstHeelPortrait,
     MstIllustrator,
     MstImagePartsGroup,
@@ -1703,6 +1706,23 @@ async def get_class_board_entity(
     )
 
 
+async def get_grand_graph_entity(
+    conn: AsyncConnection, grand_graph_id: int
+) -> GrandGraphEntity:
+    graph_db = await fetch.get_one(conn, MstGrandGraph, grand_graph_id)
+    if not graph_db:
+        raise HTTPException(status_code=404, detail="Grand Graph not found")
+
+    details = await fetch.get_all(conn, MstGrandGraphDetail, grand_graph_id)
+    items = await fetch.get_all_multiple(conn, MstItem, graph_db.removeItemIds)
+
+    return GrandGraphEntity(
+        mstGrandGraph=graph_db,
+        mstGrandGraphDetail=details,
+        mstItem=items,
+    )
+
+
 async def get_gacha_entity(conn: AsyncConnection, gacha_id: int) -> GachaEntity:
     gacha_entity = await gacha.get_gacha_entity(conn, gacha_id)
     if gacha_entity is None:

app/db/helpers/fetch.py

@@ -86,6 +86,8 @@
     mstGacha,
     mstGift,
     mstGiftAdd,
+    mstGrandGraph,
+    mstGrandGraphDetail,
     mstHeelPortrait,
     mstIllustrator,
     mstImagePartsGroup,
@@ -221,6 +223,8 @@
     MstGacha,
     MstGift,
     MstGiftAdd,
+    MstGrandGraph,
+    MstGrandGraphDetail,
     MstHeelPortrait,
     MstIllustrator,
     MstImagePartsGroup,
@@ -304,6 +308,7 @@
     MstSvtAdd: (mstSvtAdd, mstSvtAdd.c.svtId),
     MstEventDigging: (mstEventDigging, mstEventDigging.c.eventId),
     MstClassBoardBase: (mstClassBoardBase, mstClassBoardBase.c.id),
+    MstGrandGraph: (mstGrandGraph, mstGrandGraph.c.id),
     MstGacha: (mstGacha, mstGacha.c.id),
 }
 
@@ -569,6 +574,11 @@ async def get_one(
         mstClassBoardSquare.c.classBoardBaseId,
         mstClassBoardSquare.c.id,
     ),
+    MstGrandGraphDetail: (
+        mstGrandGraphDetail,
+        mstGrandGraphDetail.c.grandGraphId,
+        mstGrandGraphDetail.c.baseClassId,
+    ),
     MstHeelPortrait: (
         mstHeelPortrait,
         mstHeelPortrait.c.eventId,
@@ -838,6 +848,7 @@ async def get_all_multiple(
     AssetStorageLine: (AssetStorage, AssetStorage.c.path),
     MstSvt: (mstSvt, mstSvt.c.id),
     MstClassBoardBase: (mstClassBoardBase, mstClassBoardBase.c.id),
+    MstGrandGraph: (mstGrandGraph, mstGrandGraph.c.id),
     MstGacha: (mstGacha, mstGacha.c.id),
     MstConstant: (mstConstant, mstConstant.c.name),
 }

app/models/raw.py

@@ -2780,6 +2780,38 @@
 )
 
 
+mstGrandGraph = Table(
+    "mstGrandGraph",
+    metadata,
+    Column("id", Integer, primary_key=True),
+    Column("name", String),
+    Column("nameShort", String),
+    Column("nameShortEnglish", String),
+    Column("classBoardBaseId", Integer),
+    Column("condSvtLv", Integer),
+    Column("condSkillLv", Integer),
+    Column("condType", Integer),
+    Column("condTargetId", Integer),
+    Column("condNum", Integer),
+    Column("removeItemIds", ARRAY(Integer)),
+    Column("removeItemNums", ARRAY(Integer)),
+)
+
+
+mstGrandGraphDetail = Table(
+    "mstGrandGraphDetail",
+    metadata,
+    Column("grandGraphId", Integer, index=True),
+    Column("baseClassId", Integer),
+    Column("grandClassId", Integer),
+    Column("adjustHp", Integer),
+    Column("adjustAtk", Integer),
+    Column("condType", Integer),
+    Column("condTargetId", Integer),
+    Column("condNum", Integer),
+)
+
+
 mstFuncDisp = Table(
     "mstFuncDisp",
     metadata,
@@ -2973,6 +3005,7 @@
     [mstEventAlloutBattle],
     [mstClassBoardBase, mstClassBoardClass, mstClassBoardLine, mstFuncDisp],
     [mstClassBoardLock, mstClassBoardSquare],
+    [mstGrandGraph, mstGrandGraphDetail],
     [mstFuncTypeDetail, mstBuffTypeDetail],
     [mstGacha, mstGachaStoryAdjust, mstGachaSub, viewGachaFeaturedSvt],
     [mstItemDropEfficiency],

app/routers/nice.py

@@ -12,6 +12,7 @@
     enemy_master,
     gacha,
     gift,
+    grand_graph,
     item,
     mc,
     mm,
@@ -47,6 +48,7 @@
     NiceEventMission,
     NiceGacha,
     NiceGift,
+    NiceGrandGraph,
     NiceItem,
     NiceMasterMission,
     NiceMysticCode,
@@ -1090,6 +1092,26 @@ async def get_class_board(
         )
 
 
+@router.get(
+    "/{region}/grand-graph/{grand_graph_id}",
+    summary="Get Grand Graph data",
+    response_description="Nice Grand Graph Entity",
+    response_model=NiceGrandGraph,
+    response_model_exclude_unset=True,
+    responses=get_error_code([404]),
+)
+@cache()
+async def get_grand_graph(
+    region: Region,
+    grand_graph_id: int,
+    lang: Language = Depends(language_parameter),
+) -> Response:
+    async with get_db(region) as conn:
+        return item_response(
+            await grand_graph.get_nice_grand_graph(conn, region, grand_graph_id, lang)
+        )
+
+
 @router.get(
     "/{region}/gift/{gift_id}",
     summary="Get Gift data",

app/routers/raw.py

@@ -22,6 +22,7 @@
     EventMissionEntity,
     FunctionEntity,
     GachaEntity,
+    GrandGraphEntity,
     ItemEntity,
     MasterMissionEntity,
     MstEventAlloutBattle,
@@ -921,6 +922,27 @@ async def get_class_board(
         return item_response(class_board_entity)
 
 
+@router.get(
+    "/{region}/grand-graph/{grand_graph_id}",
+    summary="Get Grand Graph data",
+    response_description="Grand Graph entity",
+    response_model=GrandGraphEntity,
+    response_model_exclude_unset=True,
+    responses=get_error_code([404]),
+)
+@cache()
+async def get_grand_graph(
+    region: Region,
+    grand_graph_id: int,
+) -> Response:
+    """
+    Get Grand Graph info from ID
+    """
+    async with get_db(region) as conn:
+        grand_graph_entity = await raw.get_grand_graph_entity(conn, grand_graph_id)
+        return item_response(grand_graph_entity)
+
+
 @router.get(
     "/{region}/gacha/{gacha_id}",
     summary="Get Banner data",

app/schemas/enums.py

@@ -387,7 +387,6 @@ class SvtClass(StrEnum):
     grandBerserker = "grandBerserker"
 
 
-
 CLASS_NAME: dict[int, SvtClass] = {
     1: SvtClass.saber,
     2: SvtClass.archer,

app/schemas/nice.py

@@ -3207,6 +3207,34 @@ class NiceClassBoard(BaseModelORJson):
     lines: list[NiceClassBoardLine]
 
 
+class NiceGrandGraphDetail(BaseModelORJson):
+    # grandGraphId: int
+    baseClassId: int
+    grandClassId: int
+    baseClass: SvtClass | str
+    grandClass: SvtClass | str
+    adjustHp: int
+    adjustAtk: int
+    condType: NiceCondType
+    condTargetId: int
+    condNum: int
+
+
+class NiceGrandGraph(BaseModelORJson):
+    id: int
+    name: str
+    nameShort: str
+    nameShortEnglish: str
+    classBoardBaseId: int
+    condSvtLv: int
+    condSkillLv: int
+    condType: NiceCondType
+    condTargetId: int
+    condNum: int
+    removeItems: list[NiceItemAmount]
+    details: list[NiceGrandGraphDetail]
+
+
 class NiceFuncTypeDetail(BaseModelORJson):
     funcType: NiceFuncType
     ignoreValueUp: bool

app/schemas/raw.py

@@ -2607,6 +2607,32 @@ class MstClassBoardSquare(BaseModelORJson):
     priority: int
 
 
+class MstGrandGraph(BaseModelORJson):
+    id: int
+    name: str
+    nameShort: str
+    nameShortEnglish: str
+    classBoardBaseId: int
+    condSvtLv: int
+    condSkillLv: int
+    condType: int
+    condTargetId: int
+    condNum: int
+    removeItemIds: list[int]
+    removeItemNums: list[int]
+
+
+class MstGrandGraphDetail(BaseModelORJson):
+    grandGraphId: int
+    baseClassId: int
+    grandClassId: int
+    adjustHp: int
+    adjustAtk: int
+    condType: int
+    condTargetId: int
+    condNum: int
+
+
 class MstFuncDisp(BaseModelORJson):
     funcIds: list[int]
     id: int
@@ -2637,6 +2663,12 @@ class ClassBoardEntity(BaseModelORJson):
     # mstFuncDisp: list[MstFuncDisp]
 
 
+class GrandGraphEntity(BaseModelORJson):
+    mstGrandGraph: MstGrandGraph
+    mstGrandGraphDetail: list[MstGrandGraphDetail]
+    mstItem: list[MstItem]
+
+
 class GachaEntity(BaseModelORJson):
     mstGacha: MstGacha
     mstGachaStoryAdjust: list[MstGachaStoryAdjust]