funcodingdev
diff --git a/‎api/pkg/entities/heartbeat.go‎
Lines changed: 1 addition & 0 deletions b/‎api/pkg/entities/heartbeat.go‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎api/pkg/handlers/heartbeat_handler.go‎
Lines changed: 1 addition & 1 deletion b/‎api/pkg/handlers/heartbeat_handler.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎api/pkg/repositories/gorm_heartbeat_repository.go‎
Lines changed: 1 addition & 1 deletion b/‎api/pkg/repositories/gorm_heartbeat_repository.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎api/pkg/requests/heartbeat_store_request.go‎
Lines changed: 2 additions & 1 deletion b/‎api/pkg/requests/heartbeat_store_request.go‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎api/pkg/services/heartbeat_service.go‎
Lines changed: 1 addition & 0 deletions b/‎api/pkg/services/heartbeat_service.go‎
Lines changed: 1 addition & 0 deletions
@@ -10,6 +10,7 @@ import (
 type Heartbeat struct {
 	ID        uuid.UUID `json:"id" gorm:"primaryKey;type:uuid;" example:"32343a19-da5e-4b1b-a767-3298a73703cb"`
 	Owner     string    `json:"owner" gorm:"index:idx_heartbeats_owner_timestamp" example:"+18005550199"`
+	Version   string    `json:"version" example:"344c10f"`
 	UserID    UserID    `json:"user_id" example:"WB7DRDWrJZRGbYrv2CKGkqbzvqdC"`
 	Timestamp time.Time `json:"timestamp" gorm:"index:idx_heartbeats_owner_timestamp" example:"2022-06-05T14:26:01.520828+03:00"`
 }
@@ -121,7 +121,7 @@ func (h *HeartbeatHandler) Store(c *fiber.Ctx) error {
 		return h.responseUnprocessableEntity(c, errors, "validation errors while storing heartbeat")
 	}
 
-	heartbeat, err := h.service.Store(ctx, request.ToStoreParams(h.userFromContext(c)))
+	heartbeat, err := h.service.Store(ctx, request.ToStoreParams(h.userFromContext(c), c.Get("X-Client-Version")))
 	if err != nil {
 		msg := fmt.Sprintf("cannot store heartbeat with params [%+#v]", request)
 		ctxLogger.Error(stacktrace.Propagate(err, msg))
 
@@ -63,7 +63,7 @@ func (repository *gormHeartbeatRepository) Index(ctx context.Context, userID ent
 	query := repository.db.WithContext(ctx).Where("user_id = ?", userID).Where("owner = ?", owner)
 	if len(params.Query) > 0 {
 		queryPattern := "%" + params.Query + "%"
-		query.Where("quantity ILIKE ?", queryPattern)
+		query.Where("version LIKE ?", queryPattern)
 	}
 
 	heartbeats := new([]entities.Heartbeat)
 
@@ -20,9 +20,10 @@ func (input *HeartbeatStore) Sanitize() HeartbeatStore {
 }
 
 // ToStoreParams converts HeartbeatIndex to repositories.IndexParams
-func (input *HeartbeatStore) ToStoreParams(user entities.AuthUser) services.HeartbeatStoreParams {
+func (input *HeartbeatStore) ToStoreParams(user entities.AuthUser, version string) services.HeartbeatStoreParams {
 	return services.HeartbeatStoreParams{
 		Owner:     input.Owner,
+		Version:   version,
 		Timestamp: time.Now().UTC(),
 		UserID:    user.ID,
 	}
 
@@ -69,6 +69,7 @@ func (service *HeartbeatService) Index(ctx context.Context, userID entities.User
 // HeartbeatStoreParams are parameters for creating a new entities.Heartbeat
 type HeartbeatStoreParams struct {
 	Owner     string
+	Version   string
 	Timestamp time.Time
 	UserID    entities.UserID
 }
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`type Heartbeat struct {`
`11`	`11`	ID uuid.UUID `json:"id" gorm:"primaryKey;type:uuid;" example:"32343a19-da5e-4b1b-a767-3298a73703cb"`
`12`	`12`	Owner string `json:"owner" gorm:"index:idx_heartbeats_owner_timestamp" example:"+18005550199"`
	`13`	+ Version string `json:"version" example:"344c10f"`
`13`	`14`	UserID UserID `json:"user_id" example:"WB7DRDWrJZRGbYrv2CKGkqbzvqdC"`
`14`	`15`	Timestamp time.Time `json:"timestamp" gorm:"index:idx_heartbeats_owner_timestamp" example:"2022-06-05T14:26:01.520828+03:00"`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ func (h HeartbeatHandler) Store(c fiber.Ctx) error {`
`121`	`121`	`return h.responseUnprocessableEntity(c, errors, "validation errors while storing heartbeat")`
`122`	`122`	`}`
`123`	`123`
`124`		`- heartbeat, err := h.service.Store(ctx, request.ToStoreParams(h.userFromContext(c)))`
	`124`	`+ heartbeat, err := h.service.Store(ctx, request.ToStoreParams(h.userFromContext(c), c.Get("X-Client-Version")))`
`125`	`125`	`if err != nil {`
`126`	`126`	`msg := fmt.Sprintf("cannot store heartbeat with params [%+#v]", request)`
`127`	`127`	`ctxLogger.Error(stacktrace.Propagate(err, msg))`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func (repository *gormHeartbeatRepository) Index(ctx context.Context, userID ent`
`63`	`63`	`query := repository.db.WithContext(ctx).Where("user_id = ?", userID).Where("owner = ?", owner)`
`64`	`64`	`if len(params.Query) > 0 {`
`65`	`65`	`queryPattern := "%" + params.Query + "%"`
`66`		`- query.Where("quantity ILIKE ?", queryPattern)`
	`66`	`+ query.Where("version LIKE ?", queryPattern)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`heartbeats := new([]entities.Heartbeat)`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,10 @@ func (input *HeartbeatStore) Sanitize() HeartbeatStore {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`// ToStoreParams converts HeartbeatIndex to repositories.IndexParams`
`23`		`-func (input *HeartbeatStore) ToStoreParams(user entities.AuthUser) services.HeartbeatStoreParams {`
	`23`	`+func (input *HeartbeatStore) ToStoreParams(user entities.AuthUser, version string) services.HeartbeatStoreParams {`
`24`	`24`	`return services.HeartbeatStoreParams{`
`25`	`25`	`Owner: input.Owner,`
	`26`	`+ Version: version,`
`26`	`27`	`Timestamp: time.Now().UTC(),`
`27`	`28`	`UserID: user.ID,`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ func (service *HeartbeatService) Index(ctx context.Context, userID entities.User`
`69`	`69`	`// HeartbeatStoreParams are parameters for creating a new entities.Heartbeat`
`70`	`70`	`type HeartbeatStoreParams struct {`
`71`	`71`	`Owner string`
	`72`	`+ Version string`
`72`	`73`	`Timestamp time.Time`
`73`	`74`	`UserID entities.UserID`
`74`	`75`	`}`