From e9e77e8e22aaa1edaf5192e5627e0a848d4339c1 Mon Sep 17 00:00:00 2001
From: Ravi Prasad <ravi@MBP.local>
Date: Tue, 3 Jun 2025 02:25:32 -0500
Subject: [PATCH] fields fixed

---
 .DS_Store                                     | Bin 8196 -> 30724 bytes
 grafana/.DS_Store                             | Bin 0 -> 10244 bytes
 grafana/provisioning/.DS_Store                | Bin 0 -> 10244 bytes
 import.go                                     |  11 +-
 main.go                                       |   4 +
 models/player_advanced_stat.go                |   1 +
 ...player_advanced_playoffs_scrape_service.go |  98 +++++++++--
 services/player_total_scrape_service.go       | 152 +++++++++++++-----
 8 files changed, 213 insertions(+), 53 deletions(-)
 create mode 100644 grafana/.DS_Store
 create mode 100644 grafana/provisioning/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index 678b385f4791773ac0cdee1a6145222f4e9b4faf..f79fcc8d62bb9a6a7c8d3a1df67f6c6663b2c7a7 100644
GIT binary patch
literal 30724
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
L_5bJEw^jZJqxOdd

delta 142
zcmZqqz}Vs-!N9=4=v10w$iM(%asV-i7T}&(C^k_~a<V}QizJZGzzoEUKyikg;xgx?
zoctu9klV(>Y3vglcsH|iuy8OkZx%>MWZukg@SbU7$!bPHkPaY_;06+|AQLwherKM{
bUlPaxGzVl4!{m6Lshj5;#xrg#S-}VZZW$dT

diff --git a/grafana/.DS_Store b/grafana/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5c7c1754b4871635dfb6175106c5987621594be9
GIT binary patch
literal 10244
zcmeHMU2GIp6u#fI&>1?)v;}1Ou>(c<tI(EG0R^|)g4PxaZE3eHP-eR$9huJ5o!u>1
zi+wQ0h`%w>s81$}(HI|85`ROKXwU~Aut5nXzKCy#@xjCw<GFKZ8@jL>6G)KEP3}GS
zo_o%nIcLwgXU<v17-E@ZEn_-kOs3AErqXbQ#`k%@tVsceZ-V$4OE8xiEX9({yNo(S
zgc=An5NaUQK&XLG1J{EFC}#5}mkJn;p$0+?gc_LA0KXq}>KsM`I3b{ab<p6a00fH(
z?KhfJ9^mun0gMK4LO`FD&J@`L0#*bm1_V3p>ztfmG=LKV3U&s;&Ja8qL52eV>BOh|
z<P1>(!!guAsDaBhz};pR<?9Az>_eC4?}<@wBw@P=+W#mqVq0FirsfQ!qT(4dOXL!{
zRNmV;<c@ZxjdaF~8L580>T+E>k((QdZp$1U(B?F`PTH^>GvzZ_Ns~zS^jJ>P9gVpe
zC+YdTonk{)WMx2$jE&XT)K%;C4Rzzy`dDpkLjzybkB=+z+^V&AbqpM|haLB*kO#q?
zz;4Qu@2Nt<*<Q9u2v@W%C)~N5aLTMwRlPaV-4pNbjrR>`TE;UwOxs9XS+m(lo8Evn
z+aqaP23==o%FL3KJ%g^D8Fpx=Y|yX=Gem4Q+IFY)u%I4HxwgI2^{lkzI=yj=IQd>Y
zZ5~SV2|sZfO}x)@Q|TuE)IQ@-*A!hje_Z<rKga7fQyxJ@d3W~w#Y=BrU9*1EJ<a#E
z?VQxg$}8rm^VB}lsgt%Iu*_7i;SHKj(sB;$9<`F`p`NVeSqa<ha*Sb9DZ@o&vZAb9
zi$oSKl4Y$bo=I2_WvujJAFD?6C5o&a-;*S{w!2AwVltrDZ<FPIj&DktGzzpDS-FZB
zj4qFa6Gy0P)+&nTbseN1Ua+d`>SaYs?zWADX$Pnc8wu6glNFK$$jw`1dc*4YpgTNF
z@^}Iri8axip4!Ks-DY^{_7T&WdaKyIvfSql87Z@Ulq@gD(JIUSk4JdUvNdU?-Q1?$
zF3Y|Au*PJP&e6)tDt2{5BJ}%PPSzqjCshk`*G|i_T$Qu6s%VXvRz+8d$uu?1$<YOn
z2f9jD$C_Ci+fSvkG4>dHk-f&=VV|=v*hzMponybS-`F4QFBG8|C6G~ua#Ub0ZpCt}
zz)Gyf1~ejuCbT1tUi4uP3_OT~u;IYNBN)dKOyF@mi|6n>Ucjq(9dF<m-oktM1fSwF
zoWQsE9zWnLe#Qm-ii;AYSyHK_O7o;jsZOew)=Lf2ol;b4kvgOS@%B>A)B2}NC5_Pf
ziq{BvT5yd>Ckl9)-g19yOIz#q|AVKUo$dS9+<CXmU&0-3<Cdl=vlND$v)xO5!gqsd
zR^hvW?|b?78(FY$(PFhy-%WmE9xCLvS_$_Ed6H8vRhQ}74DuwgT&}LvwVC8aVp*-P
z(KU&jS1fDwb*ffGuBrIE4f+~YgDe)C)Vo!!n4DCZT(n?eL{%GO3cngO=F>Lo+jNb)
z+_f|QGwdgJo?T#nlJS>9Ba>f-JFpI$$<$l19XqfK9q7ki?8AQF<ZTSY#Rv{#jLiNB
z9>o)Q5=Zegp216a8L#-Je++Mu>A#Kl@d1wGLwt;r_!3{?6u!nc_zpkfJbuqJ@f~?4
zUR21$vz;l&cAW#X&)q|1BjnaD%QA~%szo!0Mu#1^Q6g$V0mG;oM%6H?UgfCzPu><r
z)-bXLQR?45E3fy+TF}h%qH7>-2(E$#_!kW|o!9@j7XJU=Ckls91EB_PObwv8xwAP&
zvgNY-d@*^gU8laEI&YkALO`E|2EQCn&@ac+g4Y#SQ0KHkeZ-$f1KfmwK0DF)>;y$M
h|C;|9a7i`pzg618{6Eb9^DE_fUnm8?WUjCL|8Jvgs1*PJ

literal 0
HcmV?d00001

diff --git a/grafana/provisioning/.DS_Store b/grafana/provisioning/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..29c24edb0e2054ed65ab7bf6a6faebf57e4c63c3
GIT binary patch
literal 10244
zcmeHMU2GIp6u#fI&{;alv;}1Ok%6N8RcK48fTG*og4PxaZE3eHP-b^WIx?N9JF_iV
zi+wQ0h`%w>s81$}(HI|85`ROKXwU~Aut5nXzKCy#@xjCw<GFKZ8@jMDCXgVRo7{Wu
zJ@=eDbIzV~&z!T2F~oD3I>t1{m`t5RRiWVujqme*S(5?`-vse9mSPUmS(as(dl_|z
z2sIFDAk;vpflvdX2CfGUP|W5{E*CHyLk)x)2sJRJ0e(Md)H#d=a6&-;>Y%|-0SJ~7
z+HW+cJizDC0vHS6gn&LPohh;h1gr>B3<!4G*El)BSO6yk6zmLwogsKKf(!-z(}_>>
z$r)k-hGVFKPy?51fV<5s%GY(u*at7o-&3RRaLRI0wEuBx*fL$Ow)PC9lF}J7%j7b-
zT;AI`=!|xHx|eg~dbXdhx*W$!<>z{;+cZW8)Hw;q_H@%WvOa^EF^FVOk7;L|(YTYd
zGp^6uDK_MY92rofV`B}q^)*^UWBquIHda^H*vJ<R<Kq!|ZuPpmItC6}L$-5N$b;Zc
zU^f-W_jEDgEO#U!ge%#W7w%kMxX7$>MY%cJ-IMI@P4*3_YR)w}3`_US5u;i640k}C
z?UJ-DX~*7~HAYCvp0s1-hHToYNb6QQN5n>xWp$d52<mj!v8<hrYkH<*_a;r^<a<fa
zIOOpOKXDpOvd?w0Ucx`MPe0T(MOVom*FMb8al4JIOE407Z}$Af%Whv&yJ7Ra&G)zM
zoK!0+tL7;4ls?j_?U@gnMz&XX(}tZf?E||<&5SqLGh(`C$}+laeaMJZ;9_L5s-jYj
zMi(xUWwkn)OPLSnOz*IdRifI`h^!vplOegbI~jgrCZN}DljVMnPh<@m1zL%&T1^ak
zmrKHlBb2r4A`#W?I!HgfU{%&P$PqQO+tO2p6`(e5B2;V7h>$EmZn;OMH>^pfouMI;
z#}(*kJV9@IY9D`go9=q;!-hTeR`L5}xz8Qcvqt+USzex_RhIo9kMNvjYsU1P{HE3}
z%f0-trc8#;Q7bE|c6CIf^!uCkh)H%%sut$1o|a{~I&W*$v05>$j;$7xX=<92rwbqt
zbW2!0Yi4b1Kb6YH*yHRa_Bwl)eZjtDC)sIsj{VAhXMeK4QG!yGK}H2CQH8m<6)Uh3
ztFQ(e(S$e>Xh#yg=))f9cnAk!!G?=RF^(gcz!P{5&*KHWh}ZB2-o!DyjrZ{>KEvlY
zf$#7Ge#BY)f(!T!7bQruq;g4-=1EJWdZ|I$AT>&NN-?QL>W~J++e>**>z^)_G)(I&
zUL)jb!8IbCDB@{a%LA<~ZLQn?51w{*w(nbW=iM@YDR;O{_avswQW$dHb}#h_-wmc&
zh3^Kw?-kl_biu+!i<KqXZt@f3P%*bv%eY6#lbm{)vRqSVkSB@d3T2h1&Ll4q%NlL1
zrb^_zVp*rHSJV=6&4|z2sI660$YQZsxm!_7$w?!Vixw=5DoRs4!mkFE`Lxa2HcjO&
zckPV-4Evd#XBXICWc=k&$>f*g4y?x(GWAw$#}4d52l}xW`>@|Pc?&~uFpR?(BeOq(
z$M7Vc!cjbfXYn##!K=RMAH!Q@`tRTae2C-t2%q32zQWfyg>UdJzQ<2Ek3R}bd`E$a
zmlQMck<P4bIrahC=k8JNM^n#_s1D1Ki>H~v+#4mH77;Ius9{76BkEO-sKtFPjHzKv
z4dT<keNbNSF|~-17ev)S*brPr4e&1-Y8tQqZ!P}+zfTknp$0+?+?X0bX>(_DoMg*q
z_l08eTDwMlKXu+X-GqQX3k`lbo}gcjrv<MouB6UsgZhX+j|I310eyC&@!1KAYW_9<
eGvJbH+<&XIh53J&{})!u3%*o}e9v5O`TsvtOr_5N

literal 0
HcmV?d00001

diff --git a/import.go b/import.go
index 857e658..9c1554f 100644
--- a/import.go
+++ b/import.go
@@ -9,9 +9,9 @@ import (
 	"github.com/nprasad2077/NBA_Go/utils"
 )
 
-// importPlayerAdvanced fetches and stores advanced stats for seasons 2023–2025
+// importPlayerAdvanced fetches and stores advanced stats for seasons 2017–2025
 func importPlayerAdvanced(db *gorm.DB) {
-	for season := 2023; season <= 2025; season++ {
+	for season := 2017; season <= 2022; season++ {
 		if err := services.FetchAndStorePlayerAdvancedScrapedStats(db, season, false); err != nil {
 			log.Printf("advanced import failed for %d: %v", season, err)
 		}
@@ -22,9 +22,8 @@ func importPlayerAdvanced(db *gorm.DB) {
 }
 
 // importPlayerAdvancedPlayoffs fetches and stores advanced stats for playoffs seasons 2023–2025
-
 func importPlayerAdvancedPlayoffs(db *gorm.DB) {
-	for season := 2023; season <= 2025; season++ {
+	for season := 2017; season <= 2022; season++ {
 		if err := services.FetchAndStorePlayerAdvancedScrapedStats(db, season, true); err != nil {
 			log.Printf("advanced import failed for %d: %v", season, err)
 		}
@@ -46,7 +45,7 @@ func importPlayerShotChart(db *gorm.DB) {
 
 // importPlayerTotalsScrape fetches & stores scraped regular-season total stats
 func importPlayerTotalsScrape(db *gorm.DB) {
-    for season := 1993; season <= 2025; season++ {
+    for season := 2017; season <= 2022; season++ {
         if err := services.FetchAndStorePlayerTotalScrapedStats(db, season, false); err != nil {
             log.Printf("scraped totals import failed for %d: %v", season, err)
         }
@@ -58,7 +57,7 @@ func importPlayerTotalsScrape(db *gorm.DB) {
 
 // importPlayerPlayoffsScrape fetches & stores scraped playoff total stats
 func importPlayerTotalsPlayoffsScrape(db *gorm.DB) {
-    for season := 1993; season <= 2025; season++ {
+    for season := 2017; season <= 2022; season++ {
         if err := services.FetchAndStorePlayerTotalScrapedStats(db, season, true); err != nil {
             log.Printf("scraped playoffs import failed for %d: %v", season, err)
         }
diff --git a/main.go b/main.go
index 1243581..a1602e7 100644
--- a/main.go
+++ b/main.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/adaptor"
+	"github.com/gofiber/fiber/v2/middleware/cors"
 	"github.com/gofiber/fiber/v2/middleware/logger"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	fiberswagger "github.com/swaggo/fiber-swagger"
@@ -73,6 +74,9 @@ func main() {
 		},
 	})
 
+	// — CORS Allow ALL origins (development) —
+    app.Use(cors.New())
+
 	// middlewares
 	app.Use(logger.New())
 	app.Use(middleware.MetricsMiddleware())
diff --git a/models/player_advanced_stat.go b/models/player_advanced_stat.go
index bb79a7e..13c4010 100644
--- a/models/player_advanced_stat.go
+++ b/models/player_advanced_stat.go
@@ -14,6 +14,7 @@ type PlayerAdvancedStat struct {
 	Position            string  `json:"position"`
 	Age                 int     `json:"age"`
 	Games               int     `json:"games"`
+	GamesStarted        int     `json:"gamesStarted"`
 	MinutesPlayed       int     `json:"minutesPlayed"`
 	PER                 float64 `json:"per"`
 	TSPercent           float64 `json:"tsPercent"`
diff --git a/services/player_advanced_playoffs_scrape_service.go b/services/player_advanced_playoffs_scrape_service.go
index 00e0e04..94f40e7 100644
--- a/services/player_advanced_playoffs_scrape_service.go
+++ b/services/player_advanced_playoffs_scrape_service.go
@@ -54,7 +54,7 @@ func FetchAndStorePlayerAdvancedScrapedStats(db *gorm.DB, season int, isPlayoff
         return err
     }
 
-    // 📌 pick the right table selector
+    // pick the right table selector
     var table *goquery.Selection
     if isPlayoff {
         table = doc.Find("#div_advanced_stats table#advanced_stats")
@@ -96,19 +96,38 @@ func FetchAndStorePlayerAdvancedScrapedStats(db *gorm.DB, season int, isPlayoff
         }
         data["player-additional"] = playerID
 
-        // 3. map into your model
+        // 4) pick the correct keys for ExternalID, PlayerName, Team, depending on season vs. playoff
+        //    - playoffs tables still use "rk", "player", "team_id"
+        //    - regular‐season advanced uses "ranker", "name_display", "team_name_abbr"
+        extID := mustAtoi(data["rk"])
+        if extID == 0 {
+            extID = mustAtoi(data["ranker"])
+        }
+
+        playerName := data["player"]
+        if playerName == "" {
+            playerName = data["name_display"]
+        }
+
+        teamID := data["team_id"]
+        if teamID == "" {
+            teamID = data["team_name_abbr"]
+        }
+
+        // 5) map into your GORM model
         stat := models.PlayerAdvancedStat{
-            ExternalID:         mustAtoi(data["rk"]),
+            ExternalID:         extID,
             PlayerID:           playerID,
-            PlayerName:         data["player"],
+            PlayerName:         playerName,
             Position:           data["pos"],
             Age:                mustAtoi(data["age"]),
             Games:              mustAtoi(data["g"]),
+            GamesStarted:       mustAtoi(data["games_started"]),
             MinutesPlayed:      mustAtoi(data["mp"]),
             PER:                mustParseFloat(data["per"]),
             TSPercent:          mustParseFloat(data["ts_pct"]),
-            ThreePAR:           mustParseFloat(data["three_par"]),
-            FTR:                mustParseFloat(data["ftr"]),
+            ThreePAR:           mustParseFloat(data["fg3a_per_fga_pct"]),
+            FTR:                mustParseFloat(data["fta_per_fga_pct"]),
             OffensiveRBPercent: mustParseFloat(data["orb_pct"]),
             DefensiveRBPercent: mustParseFloat(data["drb_pct"]),
             TotalRBPercent:     mustParseFloat(data["trb_pct"]),
@@ -125,12 +144,12 @@ func FetchAndStorePlayerAdvancedScrapedStats(db *gorm.DB, season int, isPlayoff
             DefensiveBox:       mustParseFloat(data["dbpm"]),
             Box:                mustParseFloat(data["bpm"]),
             VORP:               mustParseFloat(data["vorp"]),
-            Team:               data["team_id"],
+            Team:               teamID,
             Season:             season,
             IsPlayoff:          isPlayoff,
         }
 
-        // 4. upsert
+        // 6) upsert on (player_id, season, team, is_playoff)
         if err := db.Clauses(clause.OnConflict{
             Columns: []clause.Column{
                 {Name: "player_id"},
@@ -139,7 +158,8 @@ func FetchAndStorePlayerAdvancedScrapedStats(db *gorm.DB, season int, isPlayoff
                 {Name: "is_playoff"},
             },
             DoUpdates: clause.AssignmentColumns([]string{
-                "external_id", "player_name", "position", "age", "games", "minutes_played",
+                "external_id", "player_name", "position", "age", "games", "games_started", 
+                "minutes_played",
                 "per", "ts_percent", "three_par", "ftr",
                 "offensive_rb_percent", "defensive_rb_percent", "total_rb_percent",
                 "assist_percent", "steal_percent", "block_percent", "turnover_percent",
@@ -152,4 +172,62 @@ func FetchAndStorePlayerAdvancedScrapedStats(db *gorm.DB, season int, isPlayoff
     })
 
     return nil
-}
\ No newline at end of file
+}
+
+//         // 3. map into your model
+        // stat := models.PlayerAdvancedStat{
+//             ExternalID:         mustAtoi(data["rk"]),
+//             PlayerID:           playerID,
+//             PlayerName:         data["player"],
+//             Position:           data["pos"],
+//             Age:                mustAtoi(data["age"]),
+//             Games:              mustAtoi(data["g"]),
+//             MinutesPlayed:      mustAtoi(data["mp"]),
+//             PER:                mustParseFloat(data["per"]),
+//             TSPercent:          mustParseFloat(data["ts_pct"]),
+//             ThreePAR:           mustParseFloat(data["three_par"]),
+//             FTR:                mustParseFloat(data["ftr"]),
+//             OffensiveRBPercent: mustParseFloat(data["orb_pct"]),
+//             DefensiveRBPercent: mustParseFloat(data["drb_pct"]),
+//             TotalRBPercent:     mustParseFloat(data["trb_pct"]),
+//             AssistPercent:      mustParseFloat(data["ast_pct"]),
+//             StealPercent:       mustParseFloat(data["stl_pct"]),
+//             BlockPercent:       mustParseFloat(data["blk_pct"]),
+//             TurnoverPercent:    mustParseFloat(data["tov_pct"]),
+//             UsagePercent:       mustParseFloat(data["usg_pct"]),
+//             OffensiveWS:        mustParseFloat(data["ows"]),
+//             DefensiveWS:        mustParseFloat(data["dws"]),
+//             WinShares:          mustParseFloat(data["ws"]),
+//             WinSharesPer:       mustParseFloat(data["ws_per_48"]),
+//             OffensiveBox:       mustParseFloat(data["obpm"]),
+//             DefensiveBox:       mustParseFloat(data["dbpm"]),
+//             Box:                mustParseFloat(data["bpm"]),
+//             VORP:               mustParseFloat(data["vorp"]),
+//             Team:               data["team_id"],
+//             Season:             season,
+//             IsPlayoff:          isPlayoff,
+//         }
+
+//         // 4. upsert
+//         if err := db.Clauses(clause.OnConflict{
+//             Columns: []clause.Column{
+//                 {Name: "player_id"},
+//                 {Name: "season"},
+//                 {Name: "team"},
+//                 {Name: "is_playoff"},
+//             },
+//             DoUpdates: clause.AssignmentColumns([]string{
+//                 "external_id", "player_name", "position", "age", "games", "minutes_played",
+//                 "per", "ts_percent", "three_par", "ftr",
+//                 "offensive_rb_percent", "defensive_rb_percent", "total_rb_percent",
+//                 "assist_percent", "steal_percent", "block_percent", "turnover_percent",
+//                 "usage_percent", "offensive_ws", "defensive_ws", "win_shares",
+//                 "win_shares_per", "offensive_box", "defensive_box", "box", "vorp",
+//             }),
+//         }).Create(&stat).Error; err != nil {
+//             log.Printf("Failed upsert advanced for %s: %v", stat.PlayerID, err)
+//         }
+//     })
+
+//     return nil
+// }
\ No newline at end of file
diff --git a/services/player_total_scrape_service.go b/services/player_total_scrape_service.go
index 5f9e08f..f199c9a 100644
--- a/services/player_total_scrape_service.go
+++ b/services/player_total_scrape_service.go
@@ -46,7 +46,7 @@ func FetchAndStorePlayerTotalScrapedStats(db *gorm.DB, season int, isPlayoff boo
 
     body, err := io.ReadAll(resp.Body)
     if err != nil {
-        return err
+        return err 
     }
 
     doc, err := goquery.NewDocumentFromReader(bytes.NewReader(body))
@@ -59,6 +59,30 @@ func FetchAndStorePlayerTotalScrapedStats(db *gorm.DB, season int, isPlayoff boo
         return fmt.Errorf("could not find table#totals_stats")
     }
 
+    // table := doc.Find("table#totals_stats")
+    // if table.Length() == 0 {
+    //     commentSel := doc.
+    //         Find("div#all_totals_stats").
+    //         Contents().
+    //         FilterFunction(func(i int, s *goquery.Selection) bool {
+    //             return goquery.NodeName(s) == "#comment"
+    //         })
+
+    //     if commentSel.Length() == 0 {
+    //         return fmt.Errorf("could not find table#totals_stats (even inside comment)")
+    //     }
+
+    //     commentedHTML := commentSel.Nodes[0].FirstChild.Data
+    //     innerDoc, err := goquery.NewDocumentFromReader(strings.NewReader(commentedHTML))
+    //     if err != nil {
+    //         return fmt.Errorf("failed to parse commented totals_stats HTML: %w", err)
+    //     }
+    //     table = innerDoc.Find("table#totals_stats")
+    //     if table.Length() == 0 {
+    //         return fmt.Errorf("could not find table#totals_stats after un‐commenting")
+    //     }
+    // }
+
     // 1) collect the data-stat keys in header order
     var headers []string
     table.Find("thead tr th").Each(func(i int, th *goquery.Selection) {
@@ -92,42 +116,96 @@ func FetchAndStorePlayerTotalScrapedStats(db *gorm.DB, season int, isPlayoff boo
         }
         data["player-additional"] = playerID
 
-        // 3) map into GORM model
-        stat := models.PlayerTotalStat{
-            ExternalID:    mustAtoi(data["rk"]),
-            PlayerID:      playerID,
-            PlayerName:    data["player"],
-            Position:      data["pos"],
-            Age:           mustAtoi(data["age"]),
-            Games:         mustAtoi(data["g"]),
-            GamesStarted:  mustAtoi(data["gs"]),
-            MinutesPG:     mustParseFloat(data["mp"]),   // TOTAL minutes as float
-            FieldGoals:    mustAtoi(data["fg"]),
-            FieldAttempts: mustAtoi(data["fga"]),
-            FieldPercent:  mustParseFloat(data["fg_pct"]),
-            ThreeFG:       mustAtoi(data["fg3"]),
-            ThreeAttempts: mustAtoi(data["fg3a"]),
-            ThreePercent:  mustParseFloat(data["fg3_pct"]),
-            TwoFG:         mustAtoi(data["fg2"]),
-            TwoAttempts:   mustAtoi(data["fg2a"]),
-            TwoPercent:    mustParseFloat(data["fg2_pct"]),
-            EffectFGPercent: mustParseFloat(data["efg_pct"]),
-            FT:            mustAtoi(data["ft"]),
-            FTAttempts:    mustAtoi(data["fta"]),
-            FTPercent:     mustParseFloat(data["ft_pct"]),
-            OffensiveRB:   mustAtoi(data["orb"]),
-            DefensiveRB:   mustAtoi(data["drb"]),
-            TotalRB:       mustAtoi(data["trb"]),
-            Assists:       mustAtoi(data["ast"]),
-            Steals:        mustAtoi(data["stl"]),
-            Blocks:        mustAtoi(data["blk"]),
-            Turnovers:     mustAtoi(data["tov"]),
-            PersonalFouls: mustAtoi(data["pf"]),
-            Points:        mustAtoi(data["pts"]),
-            Team:          data["team_id"],
-            Season:        season,
-            IsPlayoff:     isPlayoff,
-        }
+    // 3a) pick the right “ExternalID” key (playoffs use “rk”; season uses “ranker”)
+    extID := mustAtoi(data["rk"])
+    if extID == 0 {
+        extID = mustAtoi(data["ranker"])
+    }
+
+    // 3b) pick the right “PlayerName” key (playoffs use “player”; season uses “name_display”)
+    playerName := data["player"]
+    if playerName == "" {
+        playerName = data["name_display"]
+    }
+
+    // 3c) pick the right “Team” key (playoffs use “team_id”; season uses “team_name_abbr”)
+    teamID := data["team_id"]
+    if teamID == "" {
+        teamID = data["team_name_abbr"]
+    }
+
+    stat := models.PlayerTotalStat{
+        ExternalID:    extID,
+        PlayerID:      playerID,
+        PlayerName:    playerName,
+        Position:      data["pos"],
+        Age:           mustAtoi(data["age"]),
+        Games:         mustAtoi(data["games"]),
+        GamesStarted:  mustAtoi(data["games_started"]),
+        MinutesPG:     mustParseFloat(data["mp"]),
+        FieldGoals:    mustAtoi(data["fg"]),
+        FieldAttempts: mustAtoi(data["fga"]),
+        FieldPercent:  mustParseFloat(data["fg_pct"]),
+        ThreeFG:       mustAtoi(data["fg3"]),
+        ThreeAttempts: mustAtoi(data["fg3a"]),
+        ThreePercent:  mustParseFloat(data["fg3_pct"]),
+        TwoFG:         mustAtoi(data["fg2"]),
+        TwoAttempts:   mustAtoi(data["fg2a"]),
+        TwoPercent:    mustParseFloat(data["fg2_pct"]),
+        EffectFGPercent: mustParseFloat(data["efg_pct"]),
+        FT:            mustAtoi(data["ft"]),
+        FTAttempts:    mustAtoi(data["fta"]),
+        FTPercent:     mustParseFloat(data["ft_pct"]),
+        OffensiveRB:   mustAtoi(data["orb"]),
+        DefensiveRB:   mustAtoi(data["drb"]),
+        TotalRB:       mustAtoi(data["trb"]),
+        Assists:       mustAtoi(data["ast"]),
+        Steals:        mustAtoi(data["stl"]),
+        Blocks:        mustAtoi(data["blk"]),
+        Turnovers:     mustAtoi(data["tov"]),
+        PersonalFouls: mustAtoi(data["pf"]),
+        Points:        mustAtoi(data["pts"]),
+        Team:          teamID,
+        Season:        season,
+        IsPlayoff:     isPlayoff,
+    }
+
+        // // 3) map into GORM model
+        // stat := models.PlayerTotalStat{
+        //     ExternalID:    mustAtoi(data["rk"]),
+        //     PlayerID:      playerID,
+        //     PlayerName:    data["player"],
+        //     Position:      data["pos"],
+        //     Age:           mustAtoi(data["age"]),
+        //     Games:         mustAtoi(data["g"]),
+        //     GamesStarted:  mustAtoi(data["gs"]),
+        //     MinutesPG:     mustParseFloat(data["mp"]),   // TOTAL minutes as float
+        //     FieldGoals:    mustAtoi(data["fg"]),
+        //     FieldAttempts: mustAtoi(data["fga"]),
+        //     FieldPercent:  mustParseFloat(data["fg_pct"]),
+        //     ThreeFG:       mustAtoi(data["fg3"]),
+        //     ThreeAttempts: mustAtoi(data["fg3a"]),
+        //     ThreePercent:  mustParseFloat(data["fg3_pct"]),
+        //     TwoFG:         mustAtoi(data["fg2"]),
+        //     TwoAttempts:   mustAtoi(data["fg2a"]),
+        //     TwoPercent:    mustParseFloat(data["fg2_pct"]),
+        //     EffectFGPercent: mustParseFloat(data["efg_pct"]),
+        //     FT:            mustAtoi(data["ft"]),
+        //     FTAttempts:    mustAtoi(data["fta"]),
+        //     FTPercent:     mustParseFloat(data["ft_pct"]),
+        //     OffensiveRB:   mustAtoi(data["orb"]),
+        //     DefensiveRB:   mustAtoi(data["drb"]),
+        //     TotalRB:       mustAtoi(data["trb"]),
+        //     Assists:       mustAtoi(data["ast"]),
+        //     Steals:        mustAtoi(data["stl"]),
+        //     Blocks:        mustAtoi(data["blk"]),
+        //     Turnovers:     mustAtoi(data["tov"]),
+        //     PersonalFouls: mustAtoi(data["pf"]),
+        //     Points:        mustAtoi(data["pts"]),
+        //     Team:          data["team_id"],
+        //     Season:        season,
+        //     IsPlayoff:     isPlayoff,
+        // }
 
         // 4) upsert on (player_id, season, team, is_playoff)
         if err := db.Clauses(clause.OnConflict{