Skip to content

Commit 3ff4830

Browse files
AchoArnoldAchoArnold
committed
Progress
1 parent e813f16 commit 3ff4830

14 files changed

Lines changed: 33 additions & 33 deletions

‎api/pkg/handlers/events_handler.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ func (h *EventsHandler) Dispatch(c *fiber.Ctx) error {
6363
}
6464

6565
if h.userIDFomContext(c) != h.queueConfig.UserID {
66-
msg := fmt.Sprintf("user with MessageID [%s], cannot dispatch event [%+#v]", h.userIDFomContext(c), request)
66+
msg := fmt.Sprintf("user with ID [%s], cannot dispatch event [%+#v]", h.userIDFomContext(c), request)
6767
ctxLogger.Error(stacktrace.NewError(msg))
6868
return h.responseForbidden(c)
6969
}
7070

7171
err := h.service.Dispatch(ctx, request)
7272
if err != nil {
73-
msg := fmt.Sprintf("cannot dispatch event with MessageID [%s]", request.ID())
73+
msg := fmt.Sprintf("cannot dispatch event with ID [%s]", request.ID())
7474
ctxLogger.Error(stacktrace.Propagate(err, msg))
7575
return h.responseInternalServerError(c)
7676
}

‎api/pkg/handlers/message_handler.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (h *MessageHandler) PostSend(c *fiber.Ctx) error {
100100
// @Tags Messages
101101
// @Accept json
102102
// @Produce json
103-
// @Param message_id query string true "The MessageID of the message" default(32343a19-da5e-4b1b-a767-3298a73703cb)
103+
// @Param message_id query string true "The ID of the message" default(32343a19-da5e-4b1b-a767-3298a73703cb)
104104
// @Success 200 {object} responses.MessageResponse
105105
// @Failure 400 {object} responses.BadRequest
106106
// @Failure 401 {object} responses.Unauthorized
@@ -129,7 +129,7 @@ func (h *MessageHandler) GetOutstanding(c *fiber.Ctx) error {
129129

130130
message, err := h.service.GetOutstanding(ctx, request.ToGetOutstandingParams(c.OriginalURL(), h.userIDFomContext(c), timestamp))
131131
if err != nil {
132-
msg := fmt.Sprintf("cannot get outstnading messgage with MessageID [%s]", request.MessageID)
132+
msg := fmt.Sprintf("cannot get outstnading messgage with ID [%s]", request.MessageID)
133133
ctxLogger.Error(stacktrace.Propagate(err, msg))
134134
return h.responseInternalServerError(c)
135135
}
@@ -191,7 +191,7 @@ func (h *MessageHandler) Index(c *fiber.Ctx) error {
191191
// @Tags Messages
192192
// @Accept json
193193
// @Produce json
194-
// @Param messageID path string true "MessageID of the message" default(32343a19-da5e-4b1b-a767-3298a73703ca)
194+
// @Param messageID path string true "ID of the message" default(32343a19-da5e-4b1b-a767-3298a73703ca)
195195
// @Param payload body requests.MessageEvent true "Payload of the event emitted."
196196
// @Success 200 {object} responses.MessageResponse
197197
// @Failure 400 {object} responses.BadRequest
@@ -223,7 +223,7 @@ func (h *MessageHandler) PostEvent(c *fiber.Ctx) error {
223223

224224
message, err := h.service.GetMessage(ctx, h.userIDFomContext(c), uuid.MustParse(request.MessageID))
225225
if err != nil && stacktrace.GetCode(err) == repositories.ErrCodeNotFound {
226-
return h.responseNotFound(c, fmt.Sprintf("cannot find message with MessageID [%s]", request.MessageID))
226+
return h.responseNotFound(c, fmt.Sprintf("cannot find message with ID [%s]", request.MessageID))
227227
}
228228

229229
if err != nil {

‎api/pkg/handlers/phone_handler.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func (h *PhoneHandler) Upsert(c *fiber.Ctx) error {
139139
// @Tags Phones
140140
// @Accept json
141141
// @Produce json
142-
// @Param phoneID path string true "MessageID of the phone" default(32343a19-da5e-4b1b-a767-3298a73703ca)
142+
// @Param phoneID path string true "ID of the phone" default(32343a19-da5e-4b1b-a767-3298a73703ca)
143143
// @Success 204 {object} responses.NoContent
144144
// @Failure 400 {object} responses.BadRequest
145145
// @Failure 401 {object} responses.Unauthorized

‎api/pkg/handlers/user_handler.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (h *UserHandler) Show(c *fiber.Ctx) error {
6666

6767
user, err := h.service.Get(ctx, authUser)
6868
if err != nil {
69-
msg := fmt.Sprintf("cannot get user with MessageID [%s]", authUser.ID)
69+
msg := fmt.Sprintf("cannot get user with ID [%s]", authUser.ID)
7070
ctxLogger.Error(stacktrace.Propagate(err, msg))
7171
return h.responseInternalServerError(c)
7272
}

‎api/pkg/repositories/gorm_event_listener_log_repository.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (repository *gormEventListenerLogRepository) Store(ctx context.Context, mes
3636
defer span.End()
3737

3838
if err := repository.db.WithContext(ctx).Create(message).Error; err != nil {
39-
msg := fmt.Sprintf("cannot save message with MessageID [%s]", message.ID)
39+
msg := fmt.Sprintf("cannot save message with ID [%s]", message.ID)
4040
return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
4141
}
4242

@@ -56,7 +56,7 @@ func (repository *gormEventListenerLogRepository) Has(ctx context.Context, event
5656
Find(&exists).
5757
Error
5858
if err != nil {
59-
msg := fmt.Sprintf("cannot check if log exists with event MessageID [%s] and handler [%s]", eventID, handler)
59+
msg := fmt.Sprintf("cannot check if log exists with event ID [%s] and handler [%s]", eventID, handler)
6060
return exists, repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
6161
}
6262

‎api/pkg/repositories/gorm_heartbeat_repository.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (repository *gormHeartbeatRepository) Store(ctx context.Context, heartbeat
5656
defer span.End()
5757

5858
if err := repository.db.WithContext(ctx).Create(heartbeat).Error; err != nil {
59-
msg := fmt.Sprintf("cannot save heartbeat with MessageID [%s]", heartbeat.ID)
59+
msg := fmt.Sprintf("cannot save heartbeat with ID [%s]", heartbeat.ID)
6060
return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
6161
}
6262

‎api/pkg/repositories/gorm_message_repository.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,27 +65,27 @@ func (repository *gormMessageRepository) Store(ctx context.Context, message *ent
6565
defer span.End()
6666

6767
if err := repository.db.WithContext(ctx).Create(message).Error; err != nil {
68-
msg := fmt.Sprintf("cannot save message with MessageID [%s]", message.ID)
68+
msg := fmt.Sprintf("cannot save message with ID [%s]", message.ID)
6969
return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
7070
}
7171

7272
return nil
7373
}
7474

75-
// Load an entities.Message by MessageID
75+
// Load an entities.Message by ID
7676
func (repository *gormMessageRepository) Load(ctx context.Context, userID entities.UserID, messageID uuid.UUID) (*entities.Message, error) {
7777
ctx, span := repository.tracer.Start(ctx)
7878
defer span.End()
7979

8080
message := new(entities.Message)
8181
err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Where("id = ?", messageID).First(message).Error
8282
if errors.Is(err, gorm.ErrRecordNotFound) {
83-
msg := fmt.Sprintf("message with MessageID [%s] and userID [%s] does not exist", messageID, userID)
83+
msg := fmt.Sprintf("message with ID [%s] and userID [%s] does not exist", messageID, userID)
8484
return nil, repository.tracer.WrapErrorSpan(span, stacktrace.PropagateWithCode(err, ErrCodeNotFound, msg))
8585
}
8686

8787
if err != nil {
88-
msg := fmt.Sprintf("cannot load message with MessageID [%s]", messageID)
88+
msg := fmt.Sprintf("cannot load message with ID [%s]", messageID)
8989
return nil, repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
9090
}
9191

@@ -98,7 +98,7 @@ func (repository *gormMessageRepository) Update(ctx context.Context, message *en
9898
defer span.End()
9999

100100
if err := repository.db.WithContext(ctx).Save(message).Error; err != nil {
101-
msg := fmt.Sprintf("cannot update message with MessageID [%s]", message.ID)
101+
msg := fmt.Sprintf("cannot update message with ID [%s]", message.ID)
102102
return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
103103
}
104104

‎api/pkg/repositories/gorm_message_thread_repository.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (repository *gormMessageThreadRepository) Store(ctx context.Context, thread
4141
defer span.End()
4242

4343
if err := repository.db.WithContext(ctx).Clauses(clause.OnConflict{DoNothing: true}).Create(thread).Error; err != nil {
44-
msg := fmt.Sprintf("cannot save message thread with MessageID [%s]", thread.ID)
44+
msg := fmt.Sprintf("cannot save message thread with ID [%s]", thread.ID)
4545
return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
4646
}
4747

@@ -54,7 +54,7 @@ func (repository *gormMessageThreadRepository) Update(ctx context.Context, threa
5454
defer span.End()
5555

5656
if err := repository.db.WithContext(ctx).Save(thread).Error; err != nil {
57-
msg := fmt.Sprintf("cannot update message thread thread with MessageID [%s]", thread.ID)
57+
msg := fmt.Sprintf("cannot update message thread thread with ID [%s]", thread.ID)
5858
return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
5959
}
6060

@@ -88,7 +88,7 @@ func (repository *gormMessageThreadRepository) LoadByOwnerContact(ctx context.Co
8888
return thread, nil
8989
}
9090

91-
// Load an entities.MessageThread by MessageID
91+
// Load an entities.MessageThread by ID
9292
func (repository *gormMessageThreadRepository) Load(ctx context.Context, userID entities.UserID, ID uuid.UUID) (*entities.MessageThread, error) {
9393
ctx, span := repository.tracer.Start(ctx)
9494
defer span.End()

‎api/pkg/repositories/gorm_phone_notification_repository.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (repository gormPhoneNotificationRepository) Schedule(ctx context.Context,
7070
First(lastNotification).
7171
Error
7272
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
73-
msg := fmt.Sprintf("cannot fetch last notification with phone MessageID [%s]", notification.PhoneID)
73+
msg := fmt.Sprintf("cannot fetch last notification with phone ID [%s]", notification.PhoneID)
7474
return stacktrace.Propagate(err, msg)
7575
}
7676

@@ -89,7 +89,7 @@ func (repository gormPhoneNotificationRepository) Schedule(ctx context.Context,
8989
return nil
9090
})
9191
if err != nil {
92-
msg := fmt.Sprintf("cannot schedule phone notification with MessageID [%s]", notification.ID)
92+
msg := fmt.Sprintf("cannot schedule phone notification with ID [%s]", notification.ID)
9393
return stacktrace.Propagate(err, msg)
9494
}
9595

‎api/pkg/repositories/gorm_phone_repository.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ func NewGormPhoneRepository(
3333
}
3434
}
3535

36-
// LoadByID loads a phone by MessageID
36+
// LoadByID loads a phone by ID
3737
func (repository *gormPhoneRepository) LoadByID(ctx context.Context, phoneID uuid.UUID) (*entities.Phone, error) {
3838
ctx, span := repository.tracer.Start(ctx)
3939
defer span.End()
4040

4141
phone := new(entities.Phone)
4242
err := repository.db.WithContext(ctx).First(phone, phoneID).Error
4343
if errors.Is(err, gorm.ErrRecordNotFound) {
44-
msg := fmt.Sprintf("phone with MessageID [%s] does not exist", phoneID)
44+
msg := fmt.Sprintf("phone with ID [%s] does not exist", phoneID)
4545
return nil, repository.tracer.WrapErrorSpan(span, stacktrace.PropagateWithCode(err, ErrCodeNotFound, msg))
4646
}
4747

4848
if err != nil {
49-
msg := fmt.Sprintf("cannot load phone with MessageID [%s]", phoneID)
49+
msg := fmt.Sprintf("cannot load phone with ID [%s]", phoneID)
5050
return nil, repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
5151
}
5252

@@ -63,7 +63,7 @@ func (repository *gormPhoneRepository) Delete(ctx context.Context, userID entiti
6363
Where("id = ?", phoneID).
6464
Delete(&entities.Phone{}).Error
6565
if err != nil {
66-
msg := fmt.Sprintf("cannot delete phone with MessageID [%s] and userID [%s]", phoneID, userID)
66+
msg := fmt.Sprintf("cannot delete phone with ID [%s] and userID [%s]", phoneID, userID)
6767
return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
6868
}
6969

@@ -76,7 +76,7 @@ func (repository *gormPhoneRepository) Save(ctx context.Context, phone *entities
7676
defer span.End()
7777

7878
if err := repository.db.WithContext(ctx).Save(phone).Error; err != nil {
79-
msg := fmt.Sprintf("cannot save phone with MessageID [%s]", phone.ID)
79+
msg := fmt.Sprintf("cannot save phone with ID [%s]", phone.ID)
8080
return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
8181
}
8282

0 commit comments

Comments
 (0)