Merge pull request #257 from wregulski/feat-27-remove-bux-deps

feat(BUX-27): adds mapping methods for bux-models contracts
bitcoin-sv · Jul 12, 2023 · eded11c · eded11c
2 parents c425268 + d422489
commit eded11c
Show file tree

Hide file tree

Showing 33 changed files with 307 additions and 80 deletions.
diff --git a/actions/access_keys/create.go b/actions/access_keys/create.go
@@ -42,5 +42,5 @@ func (a *Action) create(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	contract := mappings.MapToAccessKeyContract(accessKey)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusCreated, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusCreated, contract)
 }
diff --git a/actions/access_keys/get.go b/actions/access_keys/get.go
@@ -48,5 +48,5 @@ func (a *Action) get(w http.ResponseWriter, req *http.Request, _ httprouter.Para
 	contract := mappings.MapToAccessKeyContract(accessKey)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusOK, contract)
 }
diff --git a/actions/access_keys/revoke.go b/actions/access_keys/revoke.go
@@ -45,5 +45,5 @@ func (a *Action) revoke(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	contract := mappings.MapToAccessKeyContract(accessKey)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusCreated, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusCreated, contract)
 }
diff --git a/actions/access_keys/search.go b/actions/access_keys/search.go
@@ -57,5 +57,5 @@ func (a *Action) search(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	}
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(accessKeyContracts))
+	apirouter.ReturnResponse(w, req, http.StatusOK, accessKeyContracts)
 }
diff --git a/actions/admin/record.go b/actions/admin/record.go
@@ -52,5 +52,5 @@ func (a *Action) transactionRecord(w http.ResponseWriter, req *http.Request, _ h
 	contract := mappings.MapToTransactionContract(transaction)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusCreated, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusCreated, contract)
 }
diff --git a/actions/destinations/create.go b/actions/destinations/create.go
@@ -76,5 +76,5 @@ func (a *Action) create(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	contract := mappings.MapToDestinationContract(destination)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusCreated, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusCreated, contract)
 }
diff --git a/actions/destinations/get.go b/actions/destinations/get.go
@@ -58,5 +58,5 @@ func (a *Action) get(w http.ResponseWriter, req *http.Request, _ httprouter.Para
 	contract := mappings.MapToDestinationContract(destination)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusOK, contract)
 }
diff --git a/actions/destinations/search.go b/actions/destinations/search.go
@@ -57,5 +57,5 @@ func (a *Action) search(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	}
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(contracts))
+	apirouter.ReturnResponse(w, req, http.StatusOK, contracts)
 }
diff --git a/actions/destinations/update.go b/actions/destinations/update.go
@@ -61,5 +61,5 @@ func (a *Action) update(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	contract := mappings.MapToDestinationContract(destination)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusOK, contract)
 }
diff --git a/actions/paymail/create.go b/actions/paymail/create.go
@@ -49,5 +49,5 @@ func (a *Action) create(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	contract := mappings.MapToPaymailContract(paymailAddress)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusCreated, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusCreated, contract)
 }
diff --git a/actions/transactions/get.go b/actions/transactions/get.go
@@ -45,5 +45,5 @@ func (a *Action) get(w http.ResponseWriter, req *http.Request, _ httprouter.Para
 	contract := mappings.MapToTransactionContract(transaction)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusOK, contract)
 }
diff --git a/actions/transactions/new.go b/actions/transactions/new.go
@@ -82,5 +82,5 @@ func (a *Action) newTransaction(w http.ResponseWriter, req *http.Request, _ http
 	contract := mappings.MapToDraftTransactionContract(transaction)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusCreated, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusCreated, contract)
 }
diff --git a/actions/transactions/record.go b/actions/transactions/record.go
@@ -60,5 +60,5 @@ func (a *Action) record(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	contract := mappings.MapToTransactionContract(transaction)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusCreated, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusCreated, contract)
 }
diff --git a/actions/transactions/search.go b/actions/transactions/search.go
@@ -57,5 +57,5 @@ func (a *Action) search(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	}
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(contracts))
+	apirouter.ReturnResponse(w, req, http.StatusOK, contracts)
 }
diff --git a/actions/transactions/update.go b/actions/transactions/update.go
@@ -49,5 +49,5 @@ func (a *Action) update(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	contract := mappings.MapToTransactionContract(transaction)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusOK, contract)
 }
diff --git a/actions/utxos/get.go b/actions/utxos/get.go
@@ -43,5 +43,5 @@ func (a *Action) get(w http.ResponseWriter, req *http.Request, _ httprouter.Para
 	contract := mappings.MapToUtxoContract(utxo)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusOK, contract)
 }
diff --git a/actions/utxos/search.go b/actions/utxos/search.go
@@ -57,5 +57,5 @@ func (a *Action) search(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	}
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(contracts))
+	apirouter.ReturnResponse(w, req, http.StatusOK, contracts)
 }
diff --git a/actions/xpubs/create.go b/actions/xpubs/create.go
@@ -42,5 +42,5 @@ func (a *Action) create(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	contract := mappings.MapToXpubContract(xPub)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusCreated, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusCreated, contract)
 }
diff --git a/actions/xpubs/get.go b/actions/xpubs/get.go
@@ -60,5 +60,5 @@ func (a *Action) get(w http.ResponseWriter, req *http.Request, _ httprouter.Para
 	contract := mappings.MapToXpubContract(xPub)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusOK, contract)
 }
diff --git a/actions/xpubs/update.go b/actions/xpubs/update.go
@@ -47,5 +47,5 @@ func (a *Action) update(w http.ResponseWriter, req *http.Request, _ httprouter.P
 	contract := mappings.MapToXpubContract(xPub)
 
 	// Return response
-	apirouter.ReturnResponse(w, req, http.StatusOK, bux.DisplayModels(contract))
+	apirouter.ReturnResponse(w, req, http.StatusOK, contract)
 }
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/mappings/access_keys.go b/mappings/access_keys.go
@@ -9,6 +9,10 @@ import (
 
 // MapToAccessKeyContract will map the access key to the bux-models contract
 func MapToAccessKeyContract(ac *bux.AccessKey) *buxmodels.AccessKey {
+	if ac == nil {
+		return nil
+	}
+
 	return &buxmodels.AccessKey{
 		Model:     *common.MapToContract(&ac.Model),
 		ID:        ac.ID,

diff --git a/mappings/admin.go b/mappings/admin.go
@@ -7,6 +7,10 @@ import (
 
 // MapToAdminStatsContract will map the model from bux to the bux-models contract
 func MapToAdminStatsContract(s *bux.AdminStats) *buxmodels.AdminStats {
+	if s == nil {
+		return nil
+	}
+
 	return &buxmodels.AdminStats{
 		Balance:            s.Balance,
 		Destinations:       s.Destinations,

diff --git a/mappings/common/common.go b/mappings/common/common.go
@@ -8,6 +8,10 @@ import (
 
 // MapToContract will map the common model to the bux-models contract
 func MapToContract(m *bux.Model) *common.Model {
+	if m == nil {
+		return nil
+	}
+
 	return &common.Model{
 		CreatedAt: m.CreatedAt,
 		UpdatedAt: m.UpdatedAt,
@@ -18,6 +22,10 @@ func MapToContract(m *bux.Model) *common.Model {
 
 // MapToModel will map the bux-models contract to the common bux model
 func MapToModel(m *common.Model) *bux.Model {
+	if m == nil {
+		return nil
+	}
+
 	return &bux.Model{
 		CreatedAt: m.CreatedAt,
 		UpdatedAt: m.UpdatedAt,

diff --git a/mappings/destination.go b/mappings/destination.go
@@ -8,6 +8,10 @@ import (
 
 // MapToDestinationContract will map the bux destination model to the bux-models contract
 func MapToDestinationContract(d *bux.Destination) *buxmodels.Destination {
+	if d == nil {
+		return nil
+	}
+
 	return &buxmodels.Destination{
 		Model:         *common.MapToContract(&d.Model),
 		ID:            d.ID,
@@ -24,6 +28,10 @@ func MapToDestinationContract(d *bux.Destination) *buxmodels.Destination {
 
 // MapToDestinationBux will map the bux-models destination contract to the bux destination model
 func MapToDestinationBux(d *buxmodels.Destination) *bux.Destination {
+	if d == nil {
+		return nil
+	}
+
 	return &bux.Destination{
 		Model:         *common.MapToModel(&d.Model),
 		ID:            d.ID,

diff --git a/mappings/fee_unit.go b/mappings/fee_unit.go
@@ -7,6 +7,10 @@ import (
 
 // MapToFeeUnitContract will map the fee-unit model from bux to the bux-models contract
 func MapToFeeUnitContract(fu *utils.FeeUnit) (fc *buxmodels.FeeUnit) {
+	if fu == nil {
+		return nil
+	}
+
 	return &buxmodels.FeeUnit{
 		Satoshis: fu.Satoshis,
 		Bytes:    fu.Bytes,
@@ -15,6 +19,10 @@ func MapToFeeUnitContract(fu *utils.FeeUnit) (fc *buxmodels.FeeUnit) {
 
 // MapToFeeUnitBux will map the fee-unit model from bux-models to the bux contract
 func MapToFeeUnitBux(fu *buxmodels.FeeUnit) (fc *utils.FeeUnit) {
+	if fu == nil {
+		return nil
+	}
+
 	return &utils.FeeUnit{
 		Satoshis: fu.Satoshis,
 		Bytes:    fu.Bytes,

diff --git a/mappings/paymail_address.go b/mappings/paymail_address.go
@@ -8,6 +8,10 @@ import (
 
 // MapToPaymailContract will map the bux paymail-address model to the bux-models contract
 func MapToPaymailContract(pa *bux.PaymailAddress) *buxmodels.PaymailAddress {
+	if pa == nil {
+		return nil
+	}
+
 	return &buxmodels.PaymailAddress{
 		Model:           *common.MapToContract(&pa.Model),
 		ID:              pa.ID,
@@ -22,6 +26,10 @@ func MapToPaymailContract(pa *bux.PaymailAddress) *buxmodels.PaymailAddress {
 
 // MapToPaymailP4Contract will map the bux-models paymail-address contract to the bux paymail-address model
 func MapToPaymailP4Contract(p *bux.PaymailP4) *buxmodels.PaymailP4 {
+	if p == nil {
+		return nil
+	}
+
 	return &buxmodels.PaymailP4{
 		Alias:           p.Alias,
 		Domain:          p.Domain,
@@ -36,6 +44,10 @@ func MapToPaymailP4Contract(p *bux.PaymailP4) *buxmodels.PaymailP4 {
 
 // MapToPaymailP4Bux will map the bux-models paymail-address contract to the bux paymail-address model
 func MapToPaymailP4Bux(p *buxmodels.PaymailP4) *bux.PaymailP4 {
+	if p == nil {
+		return nil
+	}
+
 	return &bux.PaymailP4{
 		Alias:           p.Alias,
 		Domain:          p.Domain,

diff --git a/mappings/script_output.go b/mappings/script_output.go
@@ -7,6 +7,10 @@ import (
 
 // MapToScriptOutputContract will map the script-output model from bux to the bux-models contract
 func MapToScriptOutputContract(so *bux.ScriptOutput) (sc *buxmodels.ScriptOutput) {
+	if so == nil {
+		return nil
+	}
+
 	return &buxmodels.ScriptOutput{
 		Address:    so.Address,
 		Satoshis:   so.Satoshis,
@@ -17,6 +21,10 @@ func MapToScriptOutputContract(so *bux.ScriptOutput) (sc *buxmodels.ScriptOutput
 
 // MapToScriptOutputBux will map the script-output model from bux-models to the bux contract
 func MapToScriptOutputBux(so *buxmodels.ScriptOutput) (sc *bux.ScriptOutput) {
+	if so == nil {
+		return nil
+	}
+
 	return &bux.ScriptOutput{
 		Address:    so.Address,
 		Satoshis:   so.Satoshis,

diff --git a/mappings/sync_config.go b/mappings/sync_config.go
@@ -7,6 +7,10 @@ import (
 
 // MapToSyncConfigContract will map the sync-config model from bux to the bux-models contract
 func MapToSyncConfigContract(sc *bux.SyncConfig) *buxmodels.SyncConfig {
+	if sc == nil {
+		return nil
+	}
+
 	return &buxmodels.SyncConfig{
 		Broadcast:        sc.Broadcast,
 		BroadcastInstant: sc.BroadcastInstant,
@@ -17,6 +21,10 @@ func MapToSyncConfigContract(sc *bux.SyncConfig) *buxmodels.SyncConfig {
 
 // MapToSyncConfigBux will map the sync-config model from bux-models to the bux contract
 func MapToSyncConfigBux(sc *buxmodels.SyncConfig) *bux.SyncConfig {
+	if sc == nil {
+		return nil
+	}
+
 	return &bux.SyncConfig{
 		Broadcast:        sc.Broadcast,
 		BroadcastInstant: sc.BroadcastInstant,