Develop

api/controllers/token.controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"net/http"
+	"strconv"
 
 	"github.com/MTthoas/dex/api/models"
 	"github.com/MTthoas/dex/api/platform/database"
@@ -15,7 +16,7 @@ import (
 // @Tags Tokens
 // @Accept json
 // @Produce json
-// @Success 200 {object} []models.Token
+// @Success 200 {object} []models.Coin
 // @Failure 500 {object} map[string]interface{}
 // @Router /api/v1/tokens/ethereum [get]
 func GetEthereumTokensController(c *fiber.Ctx) error {
@@ -76,6 +77,22 @@ func CreateTokenController(c *fiber.Ctx) error {
 		})
 	}
 
+	// Verify if the token already exists with the same address
+	existingTokenByAddress, err := db.TokenQueries.GetTokenByAddress(token.Address)
+	if err == nil && existingTokenByAddress.Id != 0 {
+		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
+			"error": "Token with this address already exists",
+		})
+	}
+
+	// Verify if the token already exists with the same symbol
+	existingTokenBySymbol, err := db.TokenQueries.GetTokenBySymbol(token.Symbol)
+	if err == nil && existingTokenBySymbol.Id != 0 {
+		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
+			"error": "Token with this symbol already exists",
+		})
+	}
+
 	createdToken, err := db.TokenQueries.CreateToken(*token)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
@@ -108,14 +125,23 @@ func UpdateTokenController(c *fiber.Ctx) error {
 	}
 
 	id := c.Params("id")
+	uintID, err := strconv.ParseUint(id, 10, 32)
+	if err != nil {
+		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
+			"error": "Invalid ID format",
+		})
+	}
+
 	token := new(models.Token)
 	if err := c.BodyParser(token); err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
 			"error": "Failed to parse request body",
 		})
 	}
 
-	updatedToken, err := db.TokenQueries.GetTokenById(id)
+	token.Id = uint(uintID) // Set the ID of the token to be updated
+
+	updatedToken, err := db.TokenQueries.UpdateToken(*token)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
 			"error": err.Error(),
@@ -125,7 +151,6 @@ func UpdateTokenController(c *fiber.Ctx) error {
 	return c.Status(fiber.StatusOK).JSON(fiber.Map{
 		"data": updatedToken,
 	})
-
 }
 
 // DeleteToken function to delete a token

api/controllers/user.controller.go

@@ -107,6 +107,33 @@ func GetUserByAddress(c *fiber.Ctx) error {
 	})
 }
 
+// GetUsersBanned function to get all banned users
+// @Summary Get all banned users
+// @Description Retrieves a list of all banned users in the database.
+// @Tags User
+// @Accept json
+// @Produce json
+// @Success 200 {object} models.User
+// @Failure 500 {object} map[string]interface{}
+// @Router /api/v1/users/banned [get]
+func GetUsersBanned(c *fiber.Ctx) error {
+	db, err := database.OpenDBConnection()
+	if err != nil {
+		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
+			"error": err.Error(),
+		})
+	}
+	users, err := db.UserQueries.GetAllUsersBanned()
+	if err != nil {
+		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
+			"error": err.Error(),
+		})
+	}
+	return c.Status(fiber.StatusOK).JSON(fiber.Map{
+		"data": users,
+	})
+}
+
 // CreateUser function to create a new user
 // @Summary Create a new user
 // @Description Creates a new user in the database.

api/models/base.model.go

@@ -5,7 +5,7 @@ import (
 )
 
 type Base struct {
-	Id        uint     `json:"id" gorm:"unique;primaryKey;autoIncrement"`
+	Id        uint      `json:"id" gorm:"unique;primaryKey;autoIncrement"`
 	CreatedAt time.Time `json:"created_at" gorm:"autoCreateTime" example:"2021-08-01T00:00:00Z"`
 	UpdatedAt time.Time `json:"updated_at" gorm:"autoUpdateTime" example:"2021-08-01T00:00:00Z"`
 }

api/models/coins.model.go

@@ -0,0 +1,18 @@
+package models
+
+type Coin struct {
+	Symbol                    string  `json:"symbol"`
+	Name                      string  `json:"name"`
+	Image                     string  `json:"image"`
+	CurrentPrice              float64 `json:"current_price"`
+	MarketCap                 float64 `json:"market_cap"`
+	MarketCapRank             int     `json:"market_cap_rank"`
+	TotalVolume               float64 `json:"total_volume"`
+	PriceChange24h            float64 `json:"price_change_24h"`
+	PriceChangePercentage24h  float64 `json:"price_change_percentage_24h"`
+	MarketCapChange24h        float64 `json:"market_cap_change_24h"`
+	MarketCapChangePercentage float64 `json:"market_cap_change_percentage_24h"`
+	TotalSupply               float64 `json:"total_supply"`
+	MaxSupply                 float64 `json:"max_supply"`
+	LastUpdated               string  `json:"last_updated"`
+}

api/models/transaction.model.go

@@ -6,6 +6,8 @@ const (
 	Send            EnumTransactionType = "send"
 	Swap            EnumTransactionType = "swap"
 	Stack           EnumTransactionType = "stack"
+	Unstack         EnumTransactionType = "unstack"
+	Claim           EnumTransactionType = "claim"
 	AddLiquidity    EnumTransactionType = "add_liquidity"
 	RemoveLiquidity EnumTransactionType = "remove_liquidity"
 )

api/models/user.model.go

@@ -4,6 +4,7 @@ type User struct {
 	Base
 	Name    string `json:"name" gorm:"not null" example:"John Doe"`
 	Address string `json:"address" gorm:"unique" example:"0x123abc" validate:"required"`
+	Banned  string `json:"banned" gorm:"default:false" example:"false" validate:"required"`
 }
 
 func (user *User) TableName() string {

api/queries/token.query.go

@@ -16,7 +16,7 @@ type TokenQueries struct {
 	DB *gorm.DB
 }
 
-func GetEthereumTokens() []models.Token {
+func GetEthereumTokens() []models.Coin {
 	apiUrl := "https://api.coingecko.com/api/v3/coins/markets?vs_currency=usd&category=ethereum-ecosystem"
 
 	req, err := http.NewRequest("GET", apiUrl, nil)
@@ -47,7 +47,9 @@ func GetEthereumTokens() []models.Token {
 		return nil
 	}
 
-	var tokens []models.Token
+	// print body
+
+	var tokens []models.Coin
 	err = json.Unmarshal(body, &tokens)
 	if err != nil {
 		log.Printf("Erreur lors du décodage du JSON : %v", err)
@@ -113,10 +115,34 @@ func (tq *TokenQueries) CreateToken(token models.Token) (models.Token, error) {
 }
 
 func (tq *TokenQueries) UpdateToken(token models.Token) (models.Token, error) {
-	if err := tq.DB.Save(&token).Error; err != nil {
+	var existingToken models.Token
+	if err := tq.DB.First(&existingToken, token.Id).Error; err != nil {
+		return models.Token{}, err // Return an error if the token doesn't exist
+	}
+
+	// Update the fields
+	existingToken.Name = token.Name
+	existingToken.Symbol = token.Symbol
+	existingToken.Image = token.Image
+	existingToken.Address = token.Address
+	existingToken.CurrentPrice = token.CurrentPrice
+	existingToken.MarketCap = token.MarketCap
+	existingToken.MarketCapRank = token.MarketCapRank
+	existingToken.TotalVolume = token.TotalVolume
+	existingToken.PriceChange24h = token.PriceChange24h
+	existingToken.PriceChangePercentage24h = token.PriceChangePercentage24h
+	existingToken.MarketCapChange24h = token.MarketCapChange24h
+	existingToken.MarketCapChangePercentage = token.MarketCapChangePercentage
+	existingToken.TotalSupply = token.TotalSupply
+	existingToken.MaxSupply = token.MaxSupply
+
+	// print the updated token
+	fmt.Println(existingToken)
+
+	if err := tq.DB.Save(&existingToken).Error; err != nil {
 		return models.Token{}, err
 	}
-	return token, nil
+	return existingToken, nil
 }
 
 func (tq *TokenQueries) DeleteToken(id string) error {

api/queries/user.query.go

@@ -33,6 +33,14 @@ func (uq *UserQueries) GetUserByAddress(address string) (models.User, error) {
 	return user, nil
 }
 
+func (uq *UserQueries) GetAllUsersBanned() ([]models.User, error) {
+	var users []models.User
+	if err := uq.DB.Where("banned = ?", "true").Find(&users).Error; err != nil {
+		return []models.User{}, err
+	}
+	return users, nil
+}
+
 func (uq *UserQueries) CreateUser(user models.User) (models.User, error) {
 	if err := uq.DB.Create(&user).Error; err != nil {
 		return models.User{}, err

api/routes/routes.go

@@ -12,7 +12,6 @@ func PublicRoutes(a *fiber.App) {
 
 	route.Get("/healthCheck", controllers.HealthCheck)
 
-	// Routes for GET method:
 	route.Get("/tokens", controllers.GetTokensController)
 	route.Get("/tokens/ethereum", controllers.GetEthereumTokensController)
 	route.Get("/tokens/ethereum/:addresses", controllers.GetEthereumTokenByAddressController)
@@ -26,8 +25,9 @@ func PublicRoutes(a *fiber.App) {
 	route.Get("/users", controllers.GetUsers)
 	route.Get("/users/:id", controllers.GetUsers)
 	route.Get("/users/address/:address", controllers.GetUserByAddress)
+	route.Get("/users/banned", controllers.GetUsersBanned)
 	route.Post("/users", controllers.CreateUser)
-	route.Put("/users", controllers.UpdateUser)
+	route.Put("/users/:id", controllers.UpdateUser)
 	route.Delete("/users/:id", controllers.DeleteUser)
 
 	route.Get("/transactions", controllers.GetTransactions)

contracts/script/deploy_erc20.s.sol

@@ -16,7 +16,7 @@ contract deployERC20 is Script {
 
     function run() external {
         vm.startBroadcast(admin);
-        Token tokenA = new Token("Dorian", "DONX", 24000000 * 10 ** 18);
+        Token tokenA = new Token("Helder", "PORTO", 24000000 * 10 ** 18);
         vm.stopBroadcast();
     }
 }

contracts/script/test/Swap.s.sol

@@ -2,10 +2,10 @@
 pragma solidity ^0.8.0;
 
 import "forge-std/Script.sol";
-import "../src/token/Token.sol";
-import "../src/token/LiquidityPoolToken.sol";
-import "../src/LiquidityPool.sol";
-import "../src/LiquidityPoolFactory.sol";
+import "../../src/token/Token.sol";
+import "../../src/token/LiquidityPoolToken.sol";
+import "../../src/LiquidityPool.sol";
+import "../../src/LiquidityPoolFactory.sol";
 
 contract SwapTest is Script {
     Token tokenA;

contracts/script/test/claimRewards.s.sol

@@ -79,7 +79,7 @@ contract LiquidityPoolTest is Script {
 
         // Remove liquidity
         uint256 liquidityToRemove = liquidityToken.balanceOf(user) / 2;
-        liquidityPool.removeLiquidity(liquidityToRemove);
+        liquidityPool.removeLiquidity(liquidityToRemove, liquidityToRemove);
 
         // Get reserves after removing liquidity
         (reserveA, reserveB) = liquidityPool.getReserves();