diff --git a/db/db.go b/db/db.go
index 4fec29001..23d228337 100644
--- a/db/db.go
+++ b/db/db.go
@@ -2701,12 +2701,12 @@ func GetNotDeletedProducersByStationID(stationId int) ([]models.Producer, error)
}
return producers, nil
}
-func GetAllProducersByStationID(stationId int) ([]models.ExtendedProducerRes, error) {
+func GetAllProducersByStationID(stationId int) ([]models.ExtendedProducer, error) {
ctx, cancelfunc := context.WithTimeout(context.Background(), DbOperationTimeout*time.Second)
defer cancelfunc()
conn, err := MetadataDbClient.Client.Acquire(ctx)
if err != nil {
- return []models.ExtendedProducerRes{}, err
+ return []models.ExtendedProducer{}, err
}
defer conn.Release()
query := `SELECT
@@ -2727,20 +2727,20 @@ LIMIT 5000;
`
stmt, err := conn.Conn().Prepare(ctx, "get_producers_by_station_id", query)
if err != nil {
- return []models.ExtendedProducerRes{}, err
+ return []models.ExtendedProducer{}, err
}
rows, err := conn.Conn().Query(ctx, stmt.Name, stationId)
if err != nil {
- return []models.ExtendedProducerRes{}, err
+ return []models.ExtendedProducer{}, err
}
defer rows.Close()
- producers, err := pgx.CollectRows(rows, pgx.RowToStructByPos[models.ExtendedProducerRes])
+ producers, err := pgx.CollectRows(rows, pgx.RowToStructByPos[models.ExtendedProducer])
if err != nil {
- return []models.ExtendedProducerRes{}, err
+ return []models.ExtendedProducer{}, err
}
if len(producers) == 0 {
- return []models.ExtendedProducerRes{}, nil
+ return []models.ExtendedProducer{}, nil
}
return producers, nil
}
diff --git a/models/producers.go b/models/producers.go
index 02bdee683..dfec83c0e 100644
--- a/models/producers.go
+++ b/models/producers.go
@@ -31,17 +31,6 @@ type Producer struct {
}
type ExtendedProducer struct {
- ID int `json:"id"`
- Name string `json:"name"`
- Type string `json:"type,omitempty"`
- ConnectionId string `json:"connection_id,omitempty"`
- UpdatedAt time.Time `json:"created_at"`
- StationName string `json:"station_name"`
- IsActive bool `json:"is_active"`
- Count int `json:"count"`
-}
-
-type ExtendedProducerRes struct {
ID int `json:"id"`
Name string `json:"name"`
Type string `json:"type,omitempty"`
diff --git a/server/memphis_handlers_producers.go b/server/memphis_handlers_producers.go
index 67052b181..d1f817b0c 100644
--- a/server/memphis_handlers_producers.go
+++ b/server/memphis_handlers_producers.go
@@ -265,7 +265,7 @@ func (ph ProducersHandler) GetProducersByStation(station models.Station) ([]mode
continue
}
- producerExtendedRes := models.ExtendedProducerRes{
+ producerExtendedRes := models.ExtendedProducer{
ID: producer.ID,
Name: producer.Name,
StationName: producer.StationName,
@@ -277,25 +277,9 @@ func (ph ProducersHandler) GetProducersByStation(station models.Station) ([]mode
producersNames = append(producersNames, producer.Name)
if producer.IsActive {
- producerRes := models.ExtendedProducer{
- ID: producerExtendedRes.ID,
- Name: producerExtendedRes.Name,
- StationName: producerExtendedRes.StationName,
- UpdatedAt: producerExtendedRes.UpdatedAt,
- IsActive: producerExtendedRes.IsActive,
- Count: producerExtendedRes.ConnectedProducersCount,
- }
- connectedProducers = append(connectedProducers, producerRes)
+ connectedProducers = append(connectedProducers, producerExtendedRes)
} else {
- producerRes := models.ExtendedProducer{
- ID: producerExtendedRes.ID,
- Name: producerExtendedRes.Name,
- StationName: producerExtendedRes.StationName,
- UpdatedAt: producerExtendedRes.UpdatedAt,
- IsActive: producerExtendedRes.IsActive,
- Count: producerExtendedRes.DisconnedtedProducersCount,
- }
- disconnectedProducers = append(disconnectedProducers, producerRes)
+ disconnectedProducers = append(disconnectedProducers, producerExtendedRes)
}
}
diff --git a/ui_src/src/domain/stationOverview/stationObservabilty/ProduceConsumList/index.js b/ui_src/src/domain/stationOverview/stationObservabilty/ProduceConsumList/index.js
index e99b8ab38..71f658fc9 100644
--- a/ui_src/src/domain/stationOverview/stationObservabilty/ProduceConsumList/index.js
+++ b/ui_src/src/domain/stationOverview/stationObservabilty/ProduceConsumList/index.js
@@ -213,8 +213,8 @@ const ProduceConsumList = ({ producer }) => {
{row.name}
-
- {row.count}
+
+ {row.connected_producers_count}