Refactor Customer and User Repository Methods for ObjectID Handling
- Updated GetByIDs methods in customer and user repositories to convert string IDs to bson.ObjectID, ensuring proper handling of MongoDB object IDs. - Enhanced error handling for ID conversion to provide clearer feedback when invalid IDs are provided. - Modified notification service calls in customer and user services to use context.Background() for asynchronous email sending, improving concurrency management. - Ensured consistent handling of company IDs in the customer repository for retrieving customers by companies.
This commit is contained in:
@@ -178,7 +178,16 @@ func (r *customerRepository) GetByUsername(ctx context.Context, username string)
|
|||||||
|
|
||||||
// GetByIDs retrieves customers by IDs
|
// GetByIDs retrieves customers by IDs
|
||||||
func (r *customerRepository) GetByIDs(ctx context.Context, ids []string) ([]Customer, error) {
|
func (r *customerRepository) GetByIDs(ctx context.Context, ids []string) ([]Customer, error) {
|
||||||
customers, err := r.ormRepo.FindAll(ctx, bson.M{"_id": bson.M{"$in": ids}}, orm.NewPaginationBuilder().Limit(len(ids)).Build())
|
objectIDs := make([]bson.ObjectID, 0)
|
||||||
|
for _, id := range ids {
|
||||||
|
objectID, err := bson.ObjectIDFromHex(id)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
objectIDs = append(objectIDs, objectID)
|
||||||
|
}
|
||||||
|
|
||||||
|
customers, err := r.ormRepo.FindAll(ctx, bson.M{"_id": bson.M{"$in": objectIDs}}, orm.NewPaginationBuilder().Limit(len(ids)).Build())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if errors.Is(err, orm.ErrDocumentNotFound) {
|
if errors.Is(err, orm.ErrDocumentNotFound) {
|
||||||
return nil, errors.New("customers not found")
|
return nil, errors.New("customers not found")
|
||||||
@@ -211,7 +220,16 @@ func (r *customerRepository) GetByRole(ctx context.Context, role CustomerRole) (
|
|||||||
// GetByCompanies retrieves customers by companies
|
// GetByCompanies retrieves customers by companies
|
||||||
|
|
||||||
func (r *customerRepository) GetByCompanies(ctx context.Context, companies []string) ([]Customer, error) {
|
func (r *customerRepository) GetByCompanies(ctx context.Context, companies []string) ([]Customer, error) {
|
||||||
customers, err := r.ormRepo.FindAll(ctx, bson.M{"companies": bson.M{"$in": companies}}, orm.NewPaginationBuilder().Build())
|
companyIDs := make([]bson.ObjectID, 0)
|
||||||
|
for _, company := range companies {
|
||||||
|
id, err := bson.ObjectIDFromHex(company)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
companyIDs = append(companyIDs, id)
|
||||||
|
}
|
||||||
|
|
||||||
|
customers, err := r.ormRepo.FindAll(ctx, bson.M{"companies": bson.M{"$in": companyIDs}}, orm.NewPaginationBuilder().Build())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ func (s *customerService) Register(ctx context.Context, form *CreateCustomerForm
|
|||||||
"company_ids": Companies,
|
"company_ids": Companies,
|
||||||
})
|
})
|
||||||
|
|
||||||
s.notification.SendEmail(ctx, notification.Model{
|
go s.notification.SendEmail(context.Background(), notification.Model{
|
||||||
Recipient: customer.Email,
|
Recipient: customer.Email,
|
||||||
Title: "Welcome to Opplens",
|
Title: "Welcome to Opplens",
|
||||||
Message: fmt.Sprintf("Welcome to Opplens\nUsername: %s\nPassword: %s", strings.ToLower(customer.Username), form.Password),
|
Message: fmt.Sprintf("Welcome to Opplens\nUsername: %s\nPassword: %s", strings.ToLower(customer.Username), form.Password),
|
||||||
@@ -428,7 +428,7 @@ func (s *customerService) UpdateStatus(ctx context.Context, id string, form *Upd
|
|||||||
"status": form.Status,
|
"status": form.Status,
|
||||||
})
|
})
|
||||||
|
|
||||||
s.notification.SendEmail(ctx, notification.Model{
|
go s.notification.SendEmail(context.Background(), notification.Model{
|
||||||
Recipient: customer.Email,
|
Recipient: customer.Email,
|
||||||
Title: "Account Status Updated",
|
Title: "Account Status Updated",
|
||||||
Message: fmt.Sprintf("Your account has been %s", strings.ToUpper(form.Status)),
|
Message: fmt.Sprintf("Your account has been %s", strings.ToUpper(form.Status)),
|
||||||
@@ -888,7 +888,7 @@ func (s *customerService) RequestResetPassword(ctx context.Context, form *Reques
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Send OTP via email
|
// Send OTP via email
|
||||||
s.notification.SendEmail(ctx, notification.Model{
|
go s.notification.SendEmail(context.Background(), notification.Model{
|
||||||
Recipient: form.Email,
|
Recipient: form.Email,
|
||||||
Title: "Password Reset",
|
Title: "Password Reset",
|
||||||
Message: fmt.Sprintf("Your password reset code is: %s", otpCode),
|
Message: fmt.Sprintf("Your password reset code is: %s", otpCode),
|
||||||
@@ -1083,7 +1083,7 @@ func (s *customerService) ResetPassword(ctx context.Context, form *ResetPassword
|
|||||||
"customer_id": customer.ID,
|
"customer_id": customer.ID,
|
||||||
})
|
})
|
||||||
|
|
||||||
s.notification.SendEmail(ctx, notification.Model{
|
go s.notification.SendEmail(context.Background(), notification.Model{
|
||||||
Recipient: tokenData.Email,
|
Recipient: tokenData.Email,
|
||||||
Title: "Password Reset Success",
|
Title: "Password Reset Success",
|
||||||
Message: "Your password has been reset successfully",
|
Message: "Your password has been reset successfully",
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package notification
|
package notification
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
"github.com/asaskevich/govalidator"
|
"github.com/asaskevich/govalidator"
|
||||||
"github.com/labstack/echo/v4"
|
"github.com/labstack/echo/v4"
|
||||||
|
|
||||||
@@ -48,7 +50,7 @@ func (h *NotificationHandler) Send(c echo.Context) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Send notification
|
// Send notification
|
||||||
h.service.Send(c.Request().Context(), &req)
|
go h.service.Send(context.Background(), &req)
|
||||||
|
|
||||||
return response.Created(c, nil, "Notification sent successfully")
|
return response.Created(c, nil, "Notification sent successfully")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -397,6 +397,10 @@ func (s *notificationService) getCustomers(ctx context.Context, values []string,
|
|||||||
recipients := make([]notificationRecipient, 0)
|
recipients := make([]notificationRecipient, 0)
|
||||||
|
|
||||||
if target == string(TargetAudienceSpecificRole) {
|
if target == string(TargetAudienceSpecificRole) {
|
||||||
|
if len(values) == 0 {
|
||||||
|
return nil, errors.New("no role provided")
|
||||||
|
}
|
||||||
|
|
||||||
customers, err := s.customerService.GetCustomersByRole(ctx, values[0])
|
customers, err := s.customerService.GetCustomersByRole(ctx, values[0])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -218,7 +218,16 @@ func (r *userRepository) Delete(ctx context.Context, id string) error {
|
|||||||
|
|
||||||
// GetByIDs retrieves users by IDs
|
// GetByIDs retrieves users by IDs
|
||||||
func (r *userRepository) GetByIDs(ctx context.Context, userIDs []string) ([]User, error) {
|
func (r *userRepository) GetByIDs(ctx context.Context, userIDs []string) ([]User, error) {
|
||||||
users, err := r.ormRepo.FindAll(ctx, bson.M{"_id": bson.M{"$in": userIDs}}, orm.NewPaginationBuilder().Limit(len(userIDs)).Build())
|
objectIDs := make([]bson.ObjectID, 0)
|
||||||
|
for _, id := range userIDs {
|
||||||
|
objectID, err := bson.ObjectIDFromHex(id)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
objectIDs = append(objectIDs, objectID)
|
||||||
|
}
|
||||||
|
|
||||||
|
users, err := r.ormRepo.FindAll(ctx, bson.M{"_id": bson.M{"$in": objectIDs}}, orm.NewPaginationBuilder().Limit(len(userIDs)).Build())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ func (s *userService) Register(ctx context.Context, form *CreateUserForm) (*User
|
|||||||
"role": user.Role,
|
"role": user.Role,
|
||||||
})
|
})
|
||||||
|
|
||||||
s.notification.SendEmail(ctx, notification.Model{
|
go s.notification.SendEmail(context.Background(), notification.Model{
|
||||||
Recipient: form.Email,
|
Recipient: form.Email,
|
||||||
Title: "Welcome to Opplens",
|
Title: "Welcome to Opplens",
|
||||||
Message: fmt.Sprintf("Welcome to Opplens\nUsername: %s\nPassword: %s", strings.ToLower(form.Username), form.Password),
|
Message: fmt.Sprintf("Welcome to Opplens\nUsername: %s\nPassword: %s", strings.ToLower(form.Username), form.Password),
|
||||||
@@ -229,7 +229,7 @@ func (s *userService) UpdateStatus(ctx context.Context, id string, form *UpdateU
|
|||||||
"status": form.Status,
|
"status": form.Status,
|
||||||
})
|
})
|
||||||
|
|
||||||
s.notification.SendEmail(ctx, notification.Model{
|
go s.notification.SendEmail(context.Background(), notification.Model{
|
||||||
Recipient: user.Email,
|
Recipient: user.Email,
|
||||||
Title: "Account Status Updated",
|
Title: "Account Status Updated",
|
||||||
Message: fmt.Sprintf("Your account has been %s", strings.ToUpper(form.Status)),
|
Message: fmt.Sprintf("Your account has been %s", strings.ToUpper(form.Status)),
|
||||||
@@ -495,7 +495,7 @@ func (s *userService) ChangePassword(ctx context.Context, userID string, form *C
|
|||||||
"user_id": userID,
|
"user_id": userID,
|
||||||
})
|
})
|
||||||
|
|
||||||
s.notification.SendEmail(ctx, notification.Model{
|
go s.notification.SendEmail(context.Background(), notification.Model{
|
||||||
Recipient: user.Email,
|
Recipient: user.Email,
|
||||||
Title: "Password Reset Success",
|
Title: "Password Reset Success",
|
||||||
Message: "Your password has been reset successfully",
|
Message: "Your password has been reset successfully",
|
||||||
|
|||||||
Reference in New Issue
Block a user