Task/andrin/str 154

.env.example

@@ -23,6 +23,7 @@ REDIS_PORT=6379
 JWT_SECRET_KEY=hskdhfjfkdhsgafgwterurorhfh
 UNIT21_API_KEY=
 UNIT21_URL=https://sandbox2-api.unit21.com/v1/
+UNIT21_ORG_NAME=String
 TWILIO_ACCOUNT_SID=AC034879a536d54325687e48544403cb4d
 TWILIO_AUTH_TOKEN=
 TWILIO_SMS_SID=MG367a4f51ea6f67a28db4d126eefc734f

api/api.go

@@ -47,7 +47,7 @@ func baseMiddleware(logger *zerolog.Logger, e *echo.Echo) {
 func authRoute(config APIConfig, e *echo.Echo) service.Auth {
 	a := repository.NewAuth(config.Redis, config.DB)
 	u := repository.NewUser(config.DB)
-	c := repository.NewUserContact(config.DB)
+	c := repository.NewContact(config.DB)
 	service := service.NewAuth(a, u, c)
 	handler := handler.NewAuth(service)
 	handler.RegisterRoutes(e.Group("/auth"))
@@ -57,7 +57,7 @@ func authRoute(config APIConfig, e *echo.Echo) service.Auth {
 func platformRoute(config APIConfig, e *echo.Echo) {
 	p := repository.NewPlatform(config.DB)
 	a := repository.NewAuth(config.Redis, config.DB)
-	c := repository.NewUserContact(config.DB)
+	c := repository.NewContact(config.DB)
 	service := service.NewPlatform(p, c, a)
 	handler := handler.NewPlatform(service)
 	handler.RegisterRoutes(e.Group("/platform"), middleware.BearerAuth())
@@ -95,6 +95,6 @@ func verificationRoute(config APIConfig, e *echo.Echo) {
 		Instrument: repository.NewInstrument(config.DB),
 	}
 	service := service.NewUser(repos)
-	handler := handler.NewUser(e, service)
+	handler := handler.NewVerification(e, service)
 	handler.RegisterRoutes(e.Group("/verification"))
 }

migrations/0001_string-user_platform_asset_network.sql

@@ -108,26 +108,26 @@ CREATE INDEX network_gas_token_id_fk ON network (gas_token_id);
 -- ASSET ----------------------------------------------------------------
 DROP TRIGGER IF EXISTS update_asset_updated_at ON asset;
 DROP INDEX IF EXISTS network_gas_token_id_fk;
-DROP TABLE asset;
+DROP TABLE IF EXISTS asset;
 
 -------------------------------------------------------------------------
 -- NETWORK --------------------------------------------------------------
 DROP TRIGGER IF EXISTS update_network_updated_at ON network;
-DROP TABLE network;
+DROP TABLE IF EXISTS network;
 
 -------------------------------------------------------------------------
 -- PLATFORM -------------------------------------------------------------
 DROP TRIGGER IF EXISTS update_platform_updated_at ON platfom;
-DROP TABLE platform;
+DROP TABLE IF EXISTS platform;
 
 -------------------------------------------------------------------------
 -- STRING_USER ----------------------------------------------------------
 DROP TRIGGER IF EXISTS update_string_user_updated_at ON string_user;
-DROP TABLE string_user;
+DROP TABLE IF EXISTS string_user;
 
 -------------------------------------------------------------------------
 -- UPDATE_UPDATED_AT_COLUMN() -------------------------------------------
-DROP FUNCTION update_updated_at_column;
+DROP FUNCTION IF EXISTS update_updated_at_column;
 
 -------------------------------------------------------------------------
 -- UUID EXTENSION -------------------------------------------------------

migrations/0002_device_contact_location_instrument.sql → migrations/0002_user-platform_device_contact_location_instrument.sql

@@ -1,6 +1,15 @@
 -------------------------------------------------------------------------
 -- +goose Up
 
+-------------------------------------------------------------------------
+-- USER_PLATFORM --------------------------------------------------------
+CREATE TABLE user_platform (
+  user_id UUID REFERENCES string_user (id),
+  platform_id UUID REFERENCES platform (id)
+);
+
+CREATE UNIQUE INDEX user_platform_user_id_platform_id_idx ON user_platform(user_id, platform_id);
+
 -------------------------------------------------------------------------
 -- DEVICE ---------------------------------------------------------------
 CREATE TABLE device (
@@ -13,7 +22,7 @@ CREATE TABLE device (
   type TEXT DEFAULT '', -- enum: to be defined at struct level in Go
   description TEXT DEFAULT '',
   fingerprint TEXT DEFAULT '',
-  ip_addresses JSONB DEFAULT '[]'::JSONB,
+  ip_addresses TEXT[] DEFAULT NULL,
   user_id UUID NOT NULL REFERENCES string_user (id)
 );
 
@@ -96,19 +105,23 @@ EXECUTE PROCEDURE update_updated_at_column();
 -------------------------------------------------------------------------
 -- INSTRUMENT -----------------------------------------------------------
 DROP TRIGGER IF EXISTS update_instrument_updated_at ON instrument;
-DROP TABLE instrument;
+DROP TABLE IF EXISTS instrument;
 
 -------------------------------------------------------------------------
 -- LOCATION -----------------------------------------------------------
 DROP TRIGGER IF EXISTS update_location_updated_at ON location;
-DROP TABLE location;
+DROP TABLE IF EXISTS location;
 
 -------------------------------------------------------------------------
 -- CONTACT --------------------------------------------------------------
 DROP TRIGGER IF EXISTS update_contact_updated_at ON contact;
-DROP TABLE contact;
+DROP TABLE IF EXISTS contact;
 
 -------------------------------------------------------------------------
 -- DEVICE ---------------------------------------------------------------
 DROP TRIGGER IF EXISTS update_device_updated_at ON device;
-DROP TABLE device;
+DROP TABLE IF EXISTS device;
+
+-------------------------------------------------------------------------
+-- USER_PLATFORM -----------------------------------------------------
+DROP TABLE IF EXISTS user_platform;

migrations/0003_contact-platform_device-instrument_tx-leg_transaction.sql

@@ -93,17 +93,17 @@ EXECUTE PROCEDURE update_updated_at_column();
 -------------------------------------------------------------------------
 -- TRANSACTION ----------------------------------------------------------
 DROP TRIGGER IF EXISTS update_transaction_updated_at ON transaction;
-DROP TABLE transaction;
+DROP TABLE IF EXISTS transaction;
 
 -------------------------------------------------------------------------
 -- TX_LEG ---------------------------------------------------------------
 DROP TRIGGER IF EXISTS update_tx_leg_updated_at ON tx_leg;
-DROP TABLE tx_leg;
+DROP TABLE IF EXISTS tx_leg;
 
 -------------------------------------------------------------------------
 -- DEVICE_INSTRUMENT ----------------------------------------------------
-DROP TABLE device_instrument;
+DROP TABLE IF EXISTS device_instrument;
 
 -------------------------------------------------------------------------
 -- CONTACT_PLATFORM -----------------------------------------------------
-DROP TABLE contact_platform;
+DROP TABLE IF EXISTS contact_platform;

migrations/0004_auth_strategy.sql

@@ -17,4 +17,4 @@ EXECUTE PROCEDURE update_updated_at_column();
 
 -- +goose Down
 DROP TRIGGER IF EXISTS update_auth_strategy_updated_at ON auth_strategy;
-DROP TABLE auth_strategy;
+DROP TABLE IF EXISTS auth_strategy;

pkg/internal/common/util.go

@@ -3,7 +3,10 @@ package common
 import (
 	"crypto/sha256"
 	"encoding/hex"
+	"log"
+	"math"
 	"reflect"
+	"strconv"
 
 	"github.com/ethereum/go-ethereum/accounts"
 	ethcomm "github.com/ethereum/go-ethereum/common"
@@ -29,6 +32,17 @@ func RecoverAddress(message string, signature string) (ethcomm.Address, error) {
 	return crypto.PubkeyToAddress(*recovered), nil
 }
 
+func BigNumberToFloat(bigNumber string, decimals uint64) (floatReturn float64, err error) {
+	floatReturn, err = strconv.ParseFloat(bigNumber, 64)
+	if err != nil {
+		log.Printf("Failed to convert bigNumber to float: %s", err)
+		err = StringError(err)
+		return
+	}
+	floatReturn = floatReturn * math.Pow(10, -float64(decimals))
+	return
+}
+
 func isNil(i interface{}) bool {
 	if i == nil {
 		return true

pkg/internal/common/util_test.go

@@ -3,6 +3,7 @@ package common
 import (
 	"testing"
 
+	"github.com/String-xyz/string-api/pkg/model"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -12,3 +13,11 @@ func TestRecoverSignature(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, "0x8db97C7cEcE249c2b98bDC0226Cc4C2A57BF52FC", addr.Hex())
 }
+
+func TestKeysAndValues(t *testing.T) {
+	mType := "type"
+	m := model.ContactUpdates{Type: &mType}
+	names, vals := KeysAndValues(m)
+	assert.Len(t, names, 1)
+	assert.Len(t, vals, 1)
+}

pkg/internal/unit21/base.go

@@ -3,6 +3,7 @@ package unit21
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -12,25 +13,10 @@ import (
 	"github.com/String-xyz/string-api/pkg/internal/common"
 )
 
-// type Unit21Data interface {
-// 	Create(any) (unit21Id string, err error)
-// 	Update(id string, updates any) (err error)
-// }
-
-// type unit21Data struct {
-// 	repository repository.Transactable
-// }
-
-// func newUnit21Data(repo repository.Transactable) Unit21Data {
-// 	return &unit21Data{repository: repo}
-// }
-
-// u21type == entities
-// jsonBody = MapUserToEntity(user)
 func create(datatype string, jsonBody any) (body []byte, err error) {
 	apiKey := os.Getenv("UNIT21_API_KEY")
 	url := os.Getenv("UNIT21_URL") + datatype + "/create"
-	log.Printf("url: %s", url)
+
 	reqBodyBytes, err := json.Marshal(jsonBody)
 	if err != nil {
 		log.Printf("Could not encode %s to bytes: %s", datatype, err)
@@ -54,8 +40,6 @@ func create(datatype string, jsonBody any) (body []byte, err error) {
 	res, err := client.Do(req)
 	if err != nil {
 		log.Printf("Request failed to create %s: %s", datatype, err)
-		//handle 409 on update that is not allowed
-		//handle 423, 500, 503 for retries
 		return nil, common.StringError(err)
 	}
 
@@ -69,52 +53,61 @@ func create(datatype string, jsonBody any) (body []byte, err error) {
 
 	log.Printf("String of body from response: %s", string(body))
 
+	if res.StatusCode != 200 {
+		log.Printf("Request failed to create %s: %s", datatype, fmt.Sprint(res.StatusCode))
+		err = common.StringError(fmt.Errorf("request failed with status code %s and return body: %s", fmt.Sprint(res.StatusCode), string(body)))
+		return
+	}
+
 	return body, nil
 }
 
-func update(datatype string, id string, updates any) (body []byte, err error) {
-	// apiKey := os.Getenv("UNIT21_API_KEY")
-	// url := os.Getenv("UNIT21_URL") + "/" + datatype + "/" + id + "/update"
+func update(datatype string, id string, jsonBody any) (body []byte, err error) {
+	apiKey := os.Getenv("UNIT21_API_KEY")
+	orgName := os.Getenv("UNIT21_ORG_NAME")
+	url := os.Getenv("UNIT21_URL") + orgName + "/" + datatype + "/" + id + "/update"
 
-	// names, keyToUpdate := common.KeysAndValues(updates)
+	reqBodyBytes, err := json.Marshal(jsonBody)
+	if err != nil {
+		log.Printf("Could not encode %s to bytes: %s", datatype, err)
+		return nil, common.StringError(err)
+	}
 
-	// reqBodyBytes, err := json.Marshal(jsonBody)
-	// if err != nil {
-	// 	log.Printf("Could not encode %s to bytes: %s", datatype, err)
-	// 	return
-	// }
+	bodyReader := bytes.NewReader(reqBodyBytes)
 
-	// bodyReader := bytes.NewReader(reqBodyBytes)
+	req, err := http.NewRequest(http.MethodPut, url, bodyReader)
+	if err != nil {
+		log.Printf("Could not create request for %s: %s", datatype, err)
+		return nil, common.StringError(err)
+	}
 
-	// req, err := http.NewRequest(http.MethodPost, url, bodyReader)
-	// if err != nil {
-	// 	log.Printf("Could not create request for %s: %s", datatype, err)
-	// 	return
-	// }
+	req.Header.Add("accept", "application/json")
+	req.Header.Add("content-type", "application/json")
+	req.Header.Add("u21-key", apiKey)
 
-	// req.Header.Add("accept", "application/json")
-	// req.Header.Add("content-type", "application/json")
-	// req.Header.Add("u21-key", apiKey)
+	client := http.Client{Timeout: 10 * time.Second}
 
-	// client := http.Client{Timeout: 10 * time.Second}
+	res, err := client.Do(req)
+	if err != nil {
+		log.Printf("Request failed to update %s: %s", datatype, err)
+		return nil, common.StringError(err)
+	}
 
-	// res, err := client.Do(req)
-	// if err != nil {
-	// 	log.Printf("Request failed to create %s: %s", datatype, err)
-	// 	//handle 409 on update that is not allowed
-	// 	//handle 423, 500, 503 for retries
-	// 	return
-	// }
+	defer res.Body.Close()
 
-	// defer res.Body.Close()
+	body, err = ioutil.ReadAll(res.Body)
+	if err != nil {
+		log.Printf("Error extracting body from %s update request: %s", datatype, err)
+		return nil, common.StringError(err)
+	}
 
-	// body, err = ioutil.ReadAll(res.Body)
-	// if err != nil {
-	// 	log.Printf("Error extracting body from %s create request: %s", datatype, err)
-	// 	return
-	// }
+	log.Printf("String of body from response: %s", string(body))
 
-	// log.Printf("String of body from response: %s", string(body))
+	if res.StatusCode != 200 {
+		log.Printf("Request failed to update %s: %s", datatype, fmt.Sprint(res.StatusCode))
+		err = common.StringError(fmt.Errorf("request failed with status code %s and return body: %s", fmt.Sprint(res.StatusCode), string(body)))
+		return
+	}
 
-	return
+	return body, nil
 }