add URLParam selfTransports, that default is true, and if you want fa…

…lse should pass it with hide value, like ?selfTransports=hide&...
skycoin · Jan 13, 2025 · 2604956 · 2604956
1 parent 06b3a09
commit 2604956
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/pkg/route-finder/store/graph_test.go b/pkg/route-finder/store/graph_test.go
@@ -46,7 +46,7 @@ func (m *mockStore) GetTransportsByEdge(_ context.Context, edgePK cipher.PubKey)
 func (m *mockStore) GetNumberOfTransports(context.Context) (map[network.Type]int, error) {
 	return nil, nil
 }
-func (m *mockStore) GetAllTransports(context.Context) ([]*transport.Entry, error) {
+func (m *mockStore) GetAllTransports(context.Context, bool) ([]*transport.Entry, error) {
 	return nil, nil
 }
 func (m *mockStore) Close() {}

diff --git a/pkg/transport-discovery/api/api_test.go b/pkg/transport-discovery/api/api_test.go
@@ -315,7 +315,7 @@ func TestGETAllTransports(t *testing.T) {
 	require.Len(t, resp, 2)
 
 	t.Run("Persistence", func(t *testing.T) {
-		found, err := mock.GetAllTransports(ctx)
+		found, err := mock.GetAllTransports(ctx, true)
 		require.NoError(t, err)
 		for i, f := range found {
 			if f.ID == resp[i].ID {

diff --git a/pkg/transport-discovery/api/endpoints.go b/pkg/transport-discovery/api/endpoints.go
@@ -89,8 +89,12 @@ func (api *API) getTransportByEdge(w http.ResponseWriter, r *http.Request) {
 }
 
 func (api *API) getAllTransports(w http.ResponseWriter, r *http.Request) {
-
-	entries, err := api.store.GetAllTransports(r.Context())
+	selfTransportsParam := chi.URLParam(r, "selfTransports")
+	selfTransports := true
+	if selfTransportsParam == "hide" {
+		selfTransports = false
+	}
+	entries, err := api.store.GetAllTransports(r.Context(), selfTransports)
 	if err != nil {
 		if err != store.ErrTransportNotFound {
 			api.log(r).WithError(err).Error("Error getting transports")

diff --git a/pkg/transport-discovery/store/memory_store.go b/pkg/transport-discovery/store/memory_store.go
@@ -116,11 +116,16 @@ func (s *memStore) GetNumberOfTransports(context.Context) (map[network.Type]int,
 	return response, nil
 }
 
-func (s *memStore) GetAllTransports(context.Context) ([]*transport.Entry, error) {
+func (s *memStore) GetAllTransports(_ context.Context, selfTransports bool) ([]*transport.Entry, error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	var response []*transport.Entry
 	for _, entry := range s.transports {
+		if !selfTransports {
+			if entry.Edges[0] == entry.Edges[1] {
+				continue
+			}
+		}
 		response = append(response, entry)
 	}
 	return response, nil

diff --git a/pkg/transport-discovery/store/postgres_store.go b/pkg/transport-discovery/store/postgres_store.go
@@ -102,7 +102,7 @@ func (s *postgresStore) GetNumberOfTransports(context.Context) (map[network.Type
 	return response, nil
 }
 
-func (s *postgresStore) GetAllTransports(context.Context) ([]*transport.Entry, error) {
+func (s *postgresStore) GetAllTransports(_ context.Context, selfTransports bool) ([]*transport.Entry, error) {
 	var tpRecords []Transport
 	if err := s.client.Find(&tpRecords).Error; err != nil {
 		return nil, ErrTransportNotFound
@@ -115,6 +115,11 @@ func (s *postgresStore) GetAllTransports(context.Context) ([]*transport.Entry, e
 		if err != nil {
 			return nil, err
 		}
+		if !selfTransports {
+			if entry.Edges[0] == entry.Edges[1] {
+				continue
+			}
+		}
 		entries = append(entries, &entry)
 	}
 

diff --git a/pkg/transport-discovery/store/store.go b/pkg/transport-discovery/store/store.go
@@ -35,7 +35,7 @@ type TransportStore interface {
 	GetTransportByID(context.Context, uuid.UUID) (*transport.Entry, error)
 	GetTransportsByEdge(context.Context, cipher.PubKey) ([]*transport.Entry, error)
 	GetNumberOfTransports(context.Context) (map[network.Type]int, error)
-	GetAllTransports(context.Context) ([]*transport.Entry, error)
+	GetAllTransports(context.Context, bool) ([]*transport.Entry, error)
 	Close()
 }