Skip to content

Commit

Permalink
start on splitting api call handler function
Browse files Browse the repository at this point in the history
  • Loading branch information
UpcraftLP committed May 12, 2024
1 parent d70c082 commit 8439519
Show file tree
Hide file tree
Showing 2 changed files with 179 additions and 7 deletions.
8 changes: 4 additions & 4 deletions api/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ func Init(mux *http.ServeMux) error {
mux.HandleFunc("GET /game/classicsessioncount", handleGameClassicSessionCount)

// savedata
mux.HandleFunc("GET /savedata/get", getSaveData)
mux.HandleFunc("GET /savedata/get", handleGetSaveData)
mux.HandleFunc("POST /savedata/update", handleSaveData)
mux.HandleFunc("GET /savedata/delete", handleSaveData)
mux.HandleFunc("POST /savedata/clear", handleSaveData)
mux.HandleFunc("GET /savedata/delete", handleSaveData) // TODO use deleteSystemSave
mux.HandleFunc("POST /savedata/clear", handleSaveData) // TODO use clearSessionData
mux.HandleFunc("GET /savedata/newclear", handleNewClear)

// new session
mux.HandleFunc("POST /savedata/updateall", handleSaveData2)
mux.HandleFunc("POST /savedata/updateall", handleUpdateAll)

// daily
mux.HandleFunc("GET /daily/seed", handleDailySeed)
Expand Down
178 changes: 175 additions & 3 deletions api/endpoints.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func handleGameClassicSessionCount(w http.ResponseWriter, r *http.Request) {
_, _ = w.Write([]byte(strconv.Itoa(classicSessionCount)))
}

func getSaveData(w http.ResponseWriter, r *http.Request) {
func handleGetSaveData(w http.ResponseWriter, r *http.Request) {
token, uuid, err := tokenAndUuidFromRequest(r)
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
Expand Down Expand Up @@ -194,6 +194,175 @@ func getSaveData(w http.ResponseWriter, r *http.Request) {
jsonResponse(w, r, save)
}

// FIXME UNFINISHED!!!
func clearSessionData(w http.ResponseWriter, r *http.Request) {

Check failure on line 198 in api/endpoints.go

View workflow job for this annotation

GitHub Actions / Build (linux)

func `clearSessionData` is unused (unused)

Check failure on line 198 in api/endpoints.go

View workflow job for this annotation

GitHub Actions / Build (windows)

func `clearSessionData` is unused (unused)
token, uuid, err := tokenAndUuidFromRequest(r)
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
return
}

var slot int
if r.URL.Query().Has("slot") {
slot, err = strconv.Atoi(r.URL.Query().Get("slot"))
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
return
}
}

var save any
var session defs.SessionSaveData
err = json.NewDecoder(r.Body).Decode(&session)
if err != nil {
httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
return
}

save = session

var active bool
active, err = db.IsActiveSession(token)
if err != nil {
httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusBadRequest)
return
}

var trainerId, secretId int
if r.URL.Query().Has("trainerId") && r.URL.Query().Has("secretId") {
trainerId, err = strconv.Atoi(r.URL.Query().Get("trainerId"))
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
return
}

secretId, err = strconv.Atoi(r.URL.Query().Get("secretId"))
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
return
}
}

storedTrainerId, storedSecretId, err := db.FetchTrainerIds(uuid)
if err != nil {
httpError(w, r, err, http.StatusInternalServerError)
return
}

if storedTrainerId > 0 || storedSecretId > 0 {
if trainerId != storedTrainerId || secretId != storedSecretId {
httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest)
return
}
} else {
err = db.UpdateTrainerIds(trainerId, secretId, uuid)
if err != nil {
httpError(w, r, fmt.Errorf("unable to update traienr ID: %s", err), http.StatusInternalServerError)
return
}
}

if !active {
save = savedata.ClearResponse{Error: "session out of date"}
}

var seed string
seed, err = db.GetDailyRunSeed()
if err != nil {
httpError(w, r, err, http.StatusInternalServerError)
return
}

response, err := savedata.Clear(uuid, slot, seed, save.(defs.SessionSaveData))
if err != nil {
httpError(w, r, err, http.StatusInternalServerError)
return
}

jsonResponse(w, r, response)
}

// FIXME UNFINISHED!!!
func deleteSystemSave(w http.ResponseWriter, r *http.Request) {

Check failure on line 286 in api/endpoints.go

View workflow job for this annotation

GitHub Actions / Build (linux)

func `deleteSystemSave` is unused (unused)

Check failure on line 286 in api/endpoints.go

View workflow job for this annotation

GitHub Actions / Build (windows)

func `deleteSystemSave` is unused (unused)
token, uuid, err := tokenAndUuidFromRequest(r)
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
return
}

datatype := 0
if r.URL.Query().Has("datatype") {
datatype, err = strconv.Atoi(r.URL.Query().Get("datatype"))
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
return
}
}

var slot int
if r.URL.Query().Has("slot") {
slot, err = strconv.Atoi(r.URL.Query().Get("slot"))
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
return
}
}

var active bool
active, err = db.IsActiveSession(token)
if err != nil {
httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusInternalServerError)
return
}

if !active {
httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest)
return
}

var trainerId, secretId int

if r.URL.Query().Has("trainerId") && r.URL.Query().Has("secretId") {
trainerId, err = strconv.Atoi(r.URL.Query().Get("trainerId"))
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
return
}

secretId, err = strconv.Atoi(r.URL.Query().Get("secretId"))
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
return
}
}

storedTrainerId, storedSecretId, err := db.FetchTrainerIds(uuid)
if err != nil {
httpError(w, r, err, http.StatusInternalServerError)
return
}

if storedTrainerId > 0 || storedSecretId > 0 {
if trainerId != storedTrainerId || secretId != storedSecretId {
httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest)
return
}
} else {
if err := db.UpdateTrainerIds(trainerId, secretId, uuid); err != nil {
httpError(w, r, err, http.StatusInternalServerError)
return
}
}

err = savedata.Delete(uuid, datatype, slot)
if err != nil {
httpError(w, r, err, http.StatusInternalServerError)
return
}

w.WriteHeader(http.StatusOK)
}

func handleSaveData(w http.ResponseWriter, r *http.Request) {
token, uuid, err := tokenAndUuidFromRequest(r)
if err != nil {
Expand Down Expand Up @@ -354,7 +523,7 @@ type CombinedSaveData struct {
}

// TODO wrap this in a transaction
func handleSaveData2(w http.ResponseWriter, r *http.Request) {
func handleUpdateAll(w http.ResponseWriter, r *http.Request) {
var token []byte
token, uuid, err := tokenAndUuidFromRequest(r)
if err != nil {
Expand Down Expand Up @@ -449,7 +618,10 @@ func handleDailySeed(w http.ResponseWriter, r *http.Request) {
return
}

_, _ = w.Write([]byte(seed))
_, err = w.Write([]byte(seed))
if err != nil {
httpError(w, r, fmt.Errorf("failed to write seed: %s", err), http.StatusInternalServerError)
}
}

func handleDailyRankings(w http.ResponseWriter, r *http.Request) {
Expand Down

0 comments on commit 8439519

Please sign in to comment.