From c9808759f02eb59ed8a4faade64db0f244f9f0f8 Mon Sep 17 00:00:00 2001
From: jerick <jerick00201@gmail.com>
Date: Mon, 1 Dec 2025 20:49:53 -0500
Subject: [PATCH] Reverting back to json for server side storage

---
 __pycache__/main.cpython-311.pyc              | Bin 15905 -> 15924 bytes
 main.py                                       |  11 +++++------
 .../__pycache__/server_state.cpython-311.pyc  | Bin 9295 -> 9295 bytes
 services/__pycache__/torn_api.cpython-311.pyc | Bin 9191 -> 9191 bytes
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/__pycache__/main.cpython-311.pyc b/__pycache__/main.cpython-311.pyc
index d9a846e45b5f27728791afe13e2221df5ea500fa..2af41fed57e2f5489028f688ec491714f101d5ee 100644
GIT binary patch
delta 497
zcmZ2jv!#Z2IWI340}$l6>SfAo<dqU(&rQuuN-Zj$tS3^<n+%kB0fY?<Pr0Nw?+{UC
z6s?j-Ni0d!Pt8lst&E4LO)Z}MQ8bn{7N|IOa<G`Wirqzd`z!MH2gEOOd0yf2yugA5
zZC)ql&B&Sv)RVUPpSTVqM?8?J$x@Us*+|lv6=ZSF<|@fgjEt3&bEPX;bAbY-n_o-!
zGm57HnMD~uqL>LtC@2&ufdsN9Pn6YSY@EDDR@dy8IEEXG^|Ffd^E6qDgg}a8Ktwi(
z-~<uwAR=cnx11Vd-DV@XbBv4~n;8{km>4HaW>gT~Y^ZdSk#Y9s-^yuBav+^mJehfA
zi8+}m3fY-?DMeu*-Ju|&U~;`$JY&q{`)b*YOE!C}>oYO#-CV6H%*c3nbH7$8Bjf4K
ztUA{j8M7zf)%9Y$zF9->8585L&HRR`jEsDfON}BJe{Mc!#LvhmJo%pSTSm#vXH2>n
z851Uln<WZ>LbnJMTt%R;Daze^!fX?>1`DGz<AS^o3?Ler{K(9}q;iE(`2!PJhG+94
Ht9oVt?jMoB

delta 478
zcmdl|v#^GDIWI340}wbjYh|Wv<dqU(PfJWL$;{82tS3^<p9++D0fY?<U)dPAWj1dU
zQDqeQC7zO4lBl1WmzrA{4^#a?G?q0Es5)+PkeIoO?L~RJEAn;+*e`N<T;cM#z=8#B
zUMuF!$eIMylfL<{xDF#n0+6Z6Qj|E^P|}$-1<1+WTq*g9k+EuWj&vn!9#Eic^DF6o
zM)7nYvnUft6f*${1%)CdkU;k239?#@O_O)a>M9k*07W!ei-bTDu^=J`L~w!#cMy>~
zSx!!kv3|3w+&M<Z&dG*K!kg6<IGGqHZZ=f9!^k*iGoMNtlN?BA6;EbfSz=CRib8f~
zUP@6INOvfRh?zV|EuJxU@+Y-y#-*F%)b*Jd_igUe6lP>RvU!nKDI?>V%@R7-85wgX
zf6(<}ys_C@?->*0@6Aevsf>*LlRJze7=LYkXvELRC^Gq@@mofz&G${Z7#R~MXPG4m
zfI_ke6f{Mka45>#eA{djvj!`pGvk814-6n0nf%Diz@&18QTYQCScY%&R;zku01noP
Ag#Z8m

diff --git a/main.py b/main.py
index 0d5f1dc..c805534 100644
--- a/main.py
+++ b/main.py
@@ -85,16 +85,15 @@ async def sync_state_from_file(path: Path, kind: str):
 # -----------------------------
 @app.post("/api/populate_friendly")
 async def api_populate_friendly(data: FactionRequest):
-    # call the Torn populater (should write data/friendly_faction.json)
     await populate_friendly(data.faction_id)
     # sync STATE from file
-    await sync_state_from_file(Path("data/friendly_faction.json"), "friendly")
+    await sync_state_from_file(Path("data/friendly_members.json"), "friendly")
     return {"status": "friendly populated", "id": data.faction_id}
 
 @app.post("/api/populate_enemy")
 async def api_populate_enemy(data: FactionRequest):
     await populate_enemy(data.faction_id)
-    await sync_state_from_file(Path("data/enemy_faction.json"), "enemy")
+    await sync_state_from_file(Path("data/enemy_memberes.json"), "enemy")
     return {"status": "enemy populated", "id": data.faction_id}
 
 # -----------------------------
@@ -121,14 +120,14 @@ async def get_friendly_members():
     if STATE.friendly:
         return [m.model_dump() for m in STATE.friendly.values()]
     # fallback to file
-    path = Path("data/friendly_faction.json")
+    path = Path("data/friendly_members.json")
     return _load_json_list(path)
 
 @app.get("/api/enemy_members")
 async def get_enemy_members():
     if STATE.enemy:
         return [m.model_dump() for m in STATE.enemy.values()]
-    path = Path("data/enemy_faction.json")
+    path = Path("data/enemy_members.json")
     return _load_json_list(path)
 
 # =============================
@@ -179,7 +178,7 @@ async def api_assign_member(req: AssignMemberRequest):
     coll = STATE.friendly if kind == "friendly" else STATE.enemy
     if member_id not in coll:
         # Try to load members from file into STATE and re-check
-        file_path = Path("data/friendly_faction.json") if kind == "friendly" else Path("data/enemy_faction.json")
+        file_path = Path("data/friendly_members.json") if kind == "friendly" else Path("data/enemy_members.json")
         await sync_state_from_file(file_path, kind)
         if member_id not in coll:
             raise HTTPException(status_code=404, detail="member not found")
diff --git a/services/__pycache__/server_state.cpython-311.pyc b/services/__pycache__/server_state.cpython-311.pyc
index 3a33c31a9fba5d4a0863f9b90760469e53a30e80..bd93bb2ce85d65ed4776edfb6912fb4fd6d3f907 100644
GIT binary patch
delta 20
acmX@_ao&S_IWI340}woL(c8%Fq5=RxZ3TM(

delta 20
acmX@_ao&S_IWI340}yECYi;CqQ2_uwVFc^|

diff --git a/services/__pycache__/torn_api.cpython-311.pyc b/services/__pycache__/torn_api.cpython-311.pyc
index ea1cae790d371e33b43ca353f3f96c5aaec5fd59..f1e63948bf14a2f58aba9c075a1e31190a88cabd 100644
GIT binary patch
delta 20
acmaFv{@k5=IWI340}x!Y*W1W_M;QP`hz2bH

delta 20
acmaFv{@k5=IWI340}x35P~XUXM;QP_tOh0k