Profilepage sellshares

backend/handlers/bets/sellpositionhandler.go

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"net/http"
 	betutils "socialpredict/handlers/bets/betutils"
-	dbpm "socialpredict/handlers/math/outcomes/dbpm"
+	"socialpredict/handlers/positions"
 	"socialpredict/middleware"
 	"socialpredict/models"
 	"socialpredict/util"
+	"strconv"
 	"time"
 )
 
@@ -32,23 +33,16 @@ func SellPositionHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// get the marketID in string format
+	marketIDStr := strconv.FormatUint(uint64(redeemRequest.MarketID), 10)
+
 	// Validate the request similar to PlaceBetHandler
 	betutils.CheckMarketStatus(db, redeemRequest.MarketID)
 
 	// Calculate the net aggregate positions for the user
-	allPositions := dbpm.GetMarketPositionsByUser(db, user.Username) // Assuming this function exists and retrieves all market positions for a user
-	netPositions := dbpm.NetAggregateMarketPositions(allPositions)
-
-	// Find the user's net position for the requested market
-	var userNetPosition *models.MarketPosition
-	for _, pos := range netPositions {
-		if pos.MarketID == redeemRequest.MarketID && pos.Username == user.Username {
-			userNetPosition = &pos
-			break
-		}
-	}
 
-	if userNetPosition == nil {
+	userNetPosition, err := positions.CalculateMarketPositionForUser_WPAM_DBPM(db, marketIDStr, user.Username)
+	if userNetPosition.NoSharesOwned == 0 && userNetPosition.YesSharesOwned == 0 {
 		http.Error(w, "No position found for the given market", http.StatusBadRequest)
 		return
 	}
@@ -61,11 +55,7 @@ func SellPositionHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Proceed with redemption logic
-	// Here, you would typically update the user's balance and record the transaction
-	// as a negative bet or a separate redemption record, depending on your data model.
-
 	// For simplicity, we're just creating a negative bet to represent the sale
-	// Note: Ensure your system correctly handles negative bets in all relevant calculations
 	redeemRequest.Amount = -redeemRequest.Amount // Negate the amount to indicate sale
 	redeemRequest.PlacedAt = time.Now()          // Set the current time as the redemption time
 
@@ -75,6 +65,15 @@ func SellPositionHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// Deduct the bet and switching sides fee amount from the user's balance
+	user.AccountBalance -= redeemRequest.Amount
+
+	// Update the user's balance in the database
+	if err := db.Save(&user).Error; err != nil {
+		http.Error(w, "Error updating user balance: "+err.Error(), http.StatusInternalServerError)
+		return
+	}
+
 	// Return a success response
 	w.WriteHeader(http.StatusCreated)
 	json.NewEncoder(w).Encode(redeemRequest)

backend/handlers/markets/publicresponsemarket.go → backend/handlers/marketpublicresponse/publicresponsemarket.go

@@ -1,4 +1,4 @@
-package marketshandlers
+package marketpublicresponse
 
 import (
 	"errors"

backend/handlers/markets/marketdetailshandler.go

@@ -3,6 +3,7 @@ package marketshandlers
 import (
 	"encoding/json"
 	"net/http"
+	"socialpredict/handlers/marketpublicresponse"
 	marketmath "socialpredict/handlers/math/market"
 	"socialpredict/handlers/math/probabilities/wpam"
 	"socialpredict/handlers/tradingdata"
@@ -15,11 +16,11 @@ import (
 
 // MarketDetailResponse defines the structure for the market detail response
 type MarketDetailHandlerResponse struct {
-	Market             PublicResponseMarket         `json:"market"`
-	Creator            usersHandlers.PublicUserType `json:"creator"`
-	ProbabilityChanges []wpam.ProbabilityChange     `json:"probabilityChanges"`
-	NumUsers           int                          `json:"numUsers"`
-	TotalVolume        int64                        `json:"totalVolume"`
+	Market             marketpublicresponse.PublicResponseMarket `json:"market"`
+	Creator            usersHandlers.PublicUserType              `json:"creator"`
+	ProbabilityChanges []wpam.ProbabilityChange                  `json:"probabilityChanges"`
+	NumUsers           int                                       `json:"numUsers"`
+	TotalVolume        int64                                     `json:"totalVolume"`
 }
 
 func MarketDetailsHandler(w http.ResponseWriter, r *http.Request) {
@@ -42,7 +43,7 @@ func MarketDetailsHandler(w http.ResponseWriter, r *http.Request) {
 	bets := tradingdata.GetBetsForMarket(db, marketIDUint)
 
 	// return the PublicResponse type with information about the market
-	publicResponseMarket, err := GetPublicResponseMarketByID(db, marketId)
+	publicResponseMarket, err := marketpublicresponse.GetPublicResponseMarketByID(db, marketId)
 	if err != nil {
 		http.Error(w, "Invalid market ID", http.StatusBadRequest)
 		return

backend/handlers/positions/positionshandler.go

@@ -0,0 +1,27 @@
+package positions
+
+import (
+	"encoding/json"
+	"net/http"
+	"socialpredict/errors"
+	"socialpredict/util"
+
+	"github.com/gorilla/mux"
+)
+
+func MarketDBPMPositionsHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	marketIdStr := vars["marketId"]
+
+	// open up database to utilize connection pooling
+	db := util.GetDB()
+
+	marketDBPMPositions, err := CalculateMarketPositions_WPAM_DBPM(db, marketIdStr)
+	if errors.HandleHTTPError(w, err, http.StatusBadRequest, "Invalid request or data processing error.") {
+		return // Stop execution if there was an error.
+	}
+
+	// Respond with the bets display information
+	w.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(marketDBPMPositions)
+}

backend/handlers/markets/marketpositionshandler.go → backend/handlers/positions/positionsmath.go

@@ -1,17 +1,14 @@
-package marketshandlers
+package positions
 
 import (
-	"encoding/json"
-	"net/http"
 	"socialpredict/errors"
+	"socialpredict/handlers/marketpublicresponse"
 	"socialpredict/handlers/math/outcomes/dbpm"
 	"socialpredict/handlers/math/probabilities/wpam"
 	"socialpredict/handlers/tradingdata"
 	"socialpredict/models"
-	"socialpredict/util"
 	"strconv"
 
-	"github.com/gorilla/mux"
 	"gorm.io/gorm"
 )
 
@@ -28,23 +25,6 @@ type UserMarketPosition struct {
 	YesSharesOwned int64
 }
 
-func MarketDBPMPositionsHandler(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	marketIdStr := vars["marketId"]
-
-	// open up database to utilize connection pooling
-	db := util.GetDB()
-
-	marketDBPMPositions, err := CalculateMarketPositions_WPAM_DBPM(db, marketIdStr)
-	if errors.HandleHTTPError(w, err, http.StatusBadRequest, "Invalid request or data processing error.") {
-		return // Stop execution if there was an error.
-	}
-
-	// Respond with the bets display information
-	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(marketDBPMPositions)
-}
-
 // FetchMarketPositions fetches and summarizes positions for a given market.
 // It returns a slice of MarketPosition as defined in the dbpm package.
 func CalculateMarketPositions_WPAM_DBPM(db *gorm.DB, marketIdStr string) ([]dbpm.MarketPosition, error) {
@@ -58,7 +38,7 @@ func CalculateMarketPositions_WPAM_DBPM(db *gorm.DB, marketIdStr string) ([]dbpm
 	marketIDUint := uint(marketIDUint64)
 
 	// Assuming a function to fetch the market creation time
-	publicResponseMarket, err := GetPublicResponseMarketByID(db, marketIdStr)
+	publicResponseMarket, err := marketpublicresponse.GetPublicResponseMarketByID(db, marketIdStr)
 	if errors.ErrorLogger(err, "Can't convert marketIdStr to publicResponseMarket.") {
 		return nil, err
 	}

backend/handlers/users/userpositiononmarkethandler.go

@@ -0,0 +1,35 @@
+package usershandlers
+
+import (
+	"encoding/json"
+	"net/http"
+	"socialpredict/handlers/positions"
+	"socialpredict/middleware"
+	"socialpredict/util"
+
+	"github.com/gorilla/mux"
+)
+
+type UserMarketPositionResponse struct {
+	Username    string `json:"username"`
+	NetPosition int64  `json:"position"`
+}
+
+func UserMarketPositionHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	marketId := vars["marketId"]
+
+	// open up database to utilize connection pooling
+	db := util.GetDB()
+	user, err := middleware.ValidateTokenAndGetUser(r, db)
+	if err != nil {
+		http.Error(w, "Invalid token: "+err.Error(), http.StatusUnauthorized)
+		return
+	}
+
+	userNetPosition, err := positions.CalculateMarketPositionForUser_WPAM_DBPM(db, marketId, user.Username)
+
+	w.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(userNetPosition)
+
+}

backend/main.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"socialpredict/middleware"
 	"socialpredict/migration"
+	"socialpredict/seed"
 	"socialpredict/server"
 	"socialpredict/util"
 )
@@ -30,9 +31,9 @@ func main() {
 	migration.MigrateDB(db)
 
 	// Seed the admin user
-	// seed.SeedUsers(db)
-	// seed.SeedMarket(db)
-	// seed.SeedBets(db)
+	seed.SeedUsers(db)
+	seed.SeedMarket(db)
+	seed.SeedBets(db)
 
 	server.Start()
 }

backend/server/server.go

@@ -6,6 +6,7 @@ import (
 	"socialpredict/handlers"
 	betshandlers "socialpredict/handlers/bets"
 	marketshandlers "socialpredict/handlers/markets"
+	"socialpredict/handlers/positions"
 	usershandlers "socialpredict/handlers/users"
 	"socialpredict/middleware"
 
@@ -34,7 +35,7 @@ func Start() {
 	router.HandleFunc("/v0/markets/{marketId}", marketshandlers.MarketDetailsHandler).Methods("GET")
 	// handle market positions, get trades
 	router.HandleFunc("/v0/markets/bets/{marketId}", betshandlers.MarketBetsDisplayHandler).Methods("GET")
-	router.HandleFunc("/v0/markets/positions/{marketId}", marketshandlers.MarketDBPMPositionsHandler).Methods("GET")
+	router.HandleFunc("/v0/markets/positions/{marketId}", positions.MarketDBPMPositionsHandler).Methods("GET")
 	// show comments on markets
 
 	// handle public user stuff
@@ -49,7 +50,8 @@ func Start() {
 	// handle private user actions such as resolve a market, make a bet, create a market, change profile
 	router.HandleFunc("/v0/resolve/{marketId}", marketshandlers.ResolveMarketHandler).Methods("POST")
 	router.HandleFunc("/v0/bet", betshandlers.PlaceBetHandler).Methods("POST")
-	// router.HandleFunc("/v0/sell", betsHandlers.SellShareHandler).Methods("POST")
+	router.HandleFunc("/v0/userposition", usershandlers.UserMarketPositionHandler)
+	router.HandleFunc("/v0/sell", betshandlers.SellPositionHandler).Methods("POST")
 	router.HandleFunc("/v0/create", marketshandlers.CreateMarketHandler)
 
 	// Apply the CORS middleware to the Gorilla Mux router