Skip to content

Commit 0dbd513

Browse files
AchoArnoldAchoArnold
committed
Undo rename
1 parent 3ff4830 commit 0dbd513

5 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎api/pkg/listeners/message_listener.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (listener *MessageListener) OnMessageAPISent(ctx context.Context, event clo
7272
}
7373

7474
if _, err := listener.service.StoreSentMessage(ctx, storeParams); err != nil {
75-
msg := fmt.Sprintf("cannot store message with MessageID [%s] for event with MessageID [%s]", storeParams.ID, event.ID())
75+
msg := fmt.Sprintf("cannot store message with ID [%s] for event with MessageID [%s]", storeParams.ID, event.ID())
7676
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
7777
}
7878

@@ -110,7 +110,7 @@ func (listener *MessageListener) OnMessagePhoneSending(ctx context.Context, even
110110
}
111111

112112
if err = listener.service.HandleMessageSending(ctx, handleParams); err != nil {
113-
msg := fmt.Sprintf("cannot handle sending for message with MessageID [%s] for event with MessageID [%s]", handleParams.ID, event.ID())
113+
msg := fmt.Sprintf("cannot handle sending for message with ID [%s] for event with MessageID [%s]", handleParams.ID, event.ID())
114114
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
115115
}
116116

@@ -148,7 +148,7 @@ func (listener *MessageListener) OnMessagePhoneSent(ctx context.Context, event c
148148
}
149149

150150
if err = listener.service.HandleMessageSent(ctx, handleParams); err != nil {
151-
msg := fmt.Sprintf("cannot handle [%s] for message with MessageID [%s] for event with MessageID [%s]", event.Type(), handleParams.ID, event.ID())
151+
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with MessageID [%s]", event.Type(), handleParams.ID, event.ID())
152152
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
153153
}
154154

@@ -186,7 +186,7 @@ func (listener *MessageListener) OnMessagePhoneDelivered(ctx context.Context, ev
186186
}
187187

188188
if err = listener.service.HandleMessageDelivered(ctx, handleParams); err != nil {
189-
msg := fmt.Sprintf("cannot handle [%s] for message with MessageID [%s] for event with MessageID [%s]", event.Type(), handleParams.ID, event.ID())
189+
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with MessageID [%s]", event.Type(), handleParams.ID, event.ID())
190190
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
191191
}
192192

@@ -225,7 +225,7 @@ func (listener *MessageListener) OnMessagePhoneFailed(ctx context.Context, event
225225
}
226226

227227
if err = listener.service.HandleMessageFailed(ctx, handleParams); err != nil {
228-
msg := fmt.Sprintf("cannot handle [%s] for message with MessageID [%s] for event with MessageID [%s]", event.Type(), handleParams.ID, event.ID())
228+
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with MessageID [%s]", event.Type(), handleParams.ID, event.ID())
229229
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
230230
}
231231

@@ -266,7 +266,7 @@ func (listener *MessageListener) OnMessagePhoneReceived(ctx context.Context, eve
266266
}
267267

268268
if _, err = listener.service.StoreReceivedMessage(ctx, storeParams); err != nil {
269-
msg := fmt.Sprintf("cannot store message with MessageID [%s] for event with MessageID [%s]", storeParams.ID, event.ID())
269+
msg := fmt.Sprintf("cannot store message with ID [%s] for event with MessageID [%s]", storeParams.ID, event.ID())
270270
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
271271
}
272272

@@ -298,7 +298,7 @@ func (listener *MessageListener) onMessageNotificationFailed(ctx context.Context
298298
Source: event.Source(),
299299
}
300300
if _, err = listener.service.StoreEvent(ctx, message, storeParams); err != nil {
301-
msg := fmt.Sprintf("cannot store message event [%s] for message with MessageID [%s]", storeParams.EventName, storeParams.MessageID)
301+
msg := fmt.Sprintf("cannot store message event [%s] for message with ID [%s]", storeParams.EventName, storeParams.MessageID)
302302
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
303303
}
304304

‎api/pkg/listeners/message_thread_listener.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (listener *MessageThreadListener) OnMessageAPISent(ctx context.Context, eve
6767
}
6868

6969
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
70-
msg := fmt.Sprintf("cannot update thread for message with MessageID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
70+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
7171
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
7272
}
7373

@@ -95,7 +95,7 @@ func (listener *MessageThreadListener) OnMessagePhoneSending(ctx context.Context
9595
}
9696

9797
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
98-
msg := fmt.Sprintf("cannot update thread for message with MessageID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
98+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
9999
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
100100
}
101101

@@ -123,7 +123,7 @@ func (listener *MessageThreadListener) OnMessagePhoneSent(ctx context.Context, e
123123
}
124124

125125
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
126-
msg := fmt.Sprintf("cannot update thread for message with MessageID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
126+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
127127
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
128128
}
129129

@@ -151,7 +151,7 @@ func (listener *MessageThreadListener) OnMessagePhoneDelivered(ctx context.Conte
151151
}
152152

153153
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
154-
msg := fmt.Sprintf("cannot update thread for message with MessageID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
154+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
155155
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
156156
}
157157

@@ -179,7 +179,7 @@ func (listener *MessageThreadListener) OnMessagePhoneFailed(ctx context.Context,
179179
}
180180

181181
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
182-
msg := fmt.Sprintf("cannot update thread for message with MessageID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
182+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
183183
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
184184
}
185185

@@ -207,7 +207,7 @@ func (listener *MessageThreadListener) OnMessagePhoneReceived(ctx context.Contex
207207
}
208208

209209
if err := listener.service.UpdateThread(ctx, updateParams); err != nil {
210-
msg := fmt.Sprintf("cannot update thread for message with MessageID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
210+
msg := fmt.Sprintf("cannot update thread for message with ID [%s] for event with MessageID [%s]", updateParams.MessageID, event.ID())
211211
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
212212
}
213213

‎api/pkg/responses/response.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type InternalServerError struct {
1414
// NotFound is the response with status code is 404
1515
type NotFound struct {
1616
Status string `json:"status" example:"error"`
17-
Message string `json:"message" example:"cannot find message with MessageID [32343a19-da5e-4b1b-a767-3298a73703ca]"`
17+
Message string `json:"message" example:"cannot find message with ID [32343a19-da5e-4b1b-a767-3298a73703ca]"`
1818
}
1919

2020
// BadRequest is the response with status code is 400

‎api/pkg/services/message_service.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (service *MessageService) GetOutstanding(ctx context.Context, params Messag
7272
Content: message.Content,
7373
})
7474
if err != nil {
75-
msg := fmt.Sprintf("cannot create [%T] for message with MessageID [%s]", event, message.ID)
75+
msg := fmt.Sprintf("cannot create [%T] for message with ID [%s]", event, message.ID)
7676
return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
7777
}
7878

@@ -206,7 +206,7 @@ func (service *MessageService) ReceiveMessage(ctx context.Context, params Messag
206206

207207
message, err := service.repository.Load(ctx, params.UserID, eventPayload.ID)
208208
if err != nil {
209-
msg := fmt.Sprintf("cannot load message with MessageID [%s]", eventPayload.ID)
209+
msg := fmt.Sprintf("cannot load message with ID [%s]", eventPayload.ID)
210210
return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
211211
}
212212

@@ -319,7 +319,7 @@ func (service *MessageService) SendMessage(ctx context.Context, params MessageSe
319319
Content: params.Content,
320320
}
321321

322-
ctxLogger.Info(fmt.Sprintf("creating cloud event for message with MessageID [%s]", eventPayload.ID))
322+
ctxLogger.Info(fmt.Sprintf("creating cloud event for message with ID [%s]", eventPayload.ID))
323323

324324
event, err := service.createMessageAPISentEvent(params.Source, eventPayload)
325325
if err != nil {
@@ -338,7 +338,7 @@ func (service *MessageService) SendMessage(ctx context.Context, params MessageSe
338338

339339
message, err := service.repository.Load(ctx, eventPayload.UserID, eventPayload.ID)
340340
if err != nil {
341-
msg := fmt.Sprintf("cannot load message with MessageID [%s] in the userRepository", eventPayload.ID)
341+
msg := fmt.Sprintf("cannot load message with ID [%s] in the userRepository", eventPayload.ID)
342342
return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
343343
}
344344

‎api/pkg/services/message_thread_service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (service *MessageThreadService) createThread(ctx context.Context, params Me
125125
}
126126

127127
if err := service.repository.Store(ctx, thread); err != nil {
128-
msg := fmt.Sprintf("cannot store thread with id [%s] for message with MessageID [%s]", thread.ID, params.MessageID)
128+
msg := fmt.Sprintf("cannot store thread with id [%s] for message with ID [%s]", thread.ID, params.MessageID)
129129
return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
130130
}
131131

0 commit comments

Comments
 (0)