diff --git a/cmd/web/main.go b/cmd/web/main.go index 03a336e..160fe6b 100644 --- a/cmd/web/main.go +++ b/cmd/web/main.go @@ -157,7 +157,7 @@ func main() { tenderService := tender.NewTenderService(tenderRepository, companyService, logger) feedbackService := feedback.NewFeedbackService(feedbackRepo, tenderService, logger) tenderApprovalService := tender_approval.NewTenderApprovalService(tenderApprovalRepository, tenderService, logger) - inquiryService := inquiry.NewInquiryService(inquiryRepository, logger) + inquiryService := inquiry.NewInquiryService(inquiryRepository, notificationSDK, logger) flagService := assets.NewFlagService(logger, conf.Assets.FlagsPath) notificationService := notification.NewNotificationService(notificationSDK, userService, customerService, logger) logger.Info("Services initialized successfully", map[string]interface{}{ diff --git a/internal/inquiry/email_template.go b/internal/inquiry/email_template.go new file mode 100644 index 0000000..4025b0e --- /dev/null +++ b/internal/inquiry/email_template.go @@ -0,0 +1,286 @@ +package inquiry + +import ( + "fmt" + "strings" + "time" +) + +// EmailTemplateData represents the data needed for the email template +type EmailTemplateData struct { + FullName string + CompanyName string + WorkEmail string + PhoneNumber string + InquiryID string + CreatedAt int64 + CompanyLogo string + CompanyURL string + SupportEmail string +} + +// GenerateNewInquiryEmailTemplate generates a beautiful HTML email template for new inquiry notifications +func GenerateNewInquiryEmailTemplate(data *EmailTemplateData) string { + // Format the creation date + createdAt := time.Unix(data.CreatedAt, 0).Format("January 2, 2006 at 3:04 PM") + + html := ` + + + + + + New Inquiry Request - {{COMPANY_NAME}} + + + +
+ +
+

New Inquiry Received

+

A new inquiry has been submitted to the opplens system

+
+ + +
+
+
Identifier: {{INQUIRY_ID}}
+ +
+
+
Full Name
+
{{FULL_NAME}}
+
+ +
+
Company Name
+
{{COMPANY_NAME}}
+
+ +
+
Work Email
+
{{WORK_EMAIL}}
+
+ +
+
Phone Number
+
{{PHONE_NUMBER}}
+
+
+ +
+ Submitted on: {{CREATED_AT}} +
+

This email was automatically sent from the Opplens System

+
+ +
+
+ +
+ +` + + // Replace placeholders with actual data + html = strings.ReplaceAll(html, "{{COMPANY_NAME}}", data.CompanyName) + html = strings.ReplaceAll(html, "{{INQUIRY_ID}}", data.InquiryID) + html = strings.ReplaceAll(html, "{{FULL_NAME}}", data.FullName) + html = strings.ReplaceAll(html, "{{WORK_EMAIL}}", data.WorkEmail) + html = strings.ReplaceAll(html, "{{PHONE_NUMBER}}", data.PhoneNumber) + html = strings.ReplaceAll(html, "{{CREATED_AT}}", createdAt) + + return html +} + +// GenerateNewInquiryEmailMessage generates a simple text message for the email +func GenerateNewInquiryEmailMessage(data *EmailTemplateData) string { + createdAt := time.Unix(data.CreatedAt, 0).Format("January 2, 2006 at 3:04 PM") + + return fmt.Sprintf(` +New Inquiry Received + +Inquiry ID: %s +Full Name: %s +Company Name: %s +Work Email: %s +Phone Number: %s +Submitted on: %s + +Please check the admin panel for more details. +`, + data.InquiryID, + data.FullName, + data.CompanyName, + data.WorkEmail, + data.PhoneNumber, + createdAt, + ) +} diff --git a/internal/inquiry/handler.go b/internal/inquiry/handler.go index 6c73012..5d91d3a 100644 --- a/internal/inquiry/handler.go +++ b/internal/inquiry/handler.go @@ -59,7 +59,7 @@ func (h *Handler) CreateInquiry(c echo.Context) error { "status": duplicateErr.Status, "created_at": duplicateErr.CreatedAt, }) - + // Return conflict with detailed error information return c.JSON(409, response.APIResponse{ Success: false, @@ -116,7 +116,7 @@ func (h *Handler) GetInquiryByID(c echo.Context) error { // @Router /admin/v1/inquiries/{id}/status [put] func (h *Handler) UpdateInquiryStatus(c echo.Context) error { idStr := c.Param("id") - + form, err := response.Parse[UpdateInquiryStatusForm](c) if err != nil { return response.BadRequest(c, "Invalid request format", "") diff --git a/internal/inquiry/service.go b/internal/inquiry/service.go index 67ea98d..38806fd 100644 --- a/internal/inquiry/service.go +++ b/internal/inquiry/service.go @@ -3,7 +3,9 @@ package inquiry import ( "context" "errors" + "fmt" "tm/pkg/logger" + "tm/pkg/notification" "tm/pkg/response" ) @@ -19,13 +21,15 @@ type Service interface { // inquiryService implements the Service interface type inquiryService struct { repository Repository + sdk notification.SDK logger logger.Logger } // NewInquiryService creates a new inquiry service -func NewInquiryService(repository Repository, logger logger.Logger) Service { +func NewInquiryService(repository Repository, sdk notification.SDK, logger logger.Logger) Service { return &inquiryService{ repository: repository, + sdk: sdk, logger: logger, } } @@ -39,44 +43,44 @@ func (s *inquiryService) Create(ctx context.Context, form *CreateInquiryForm) (* }) // Check for duplicate pending inquiries by email - existingInquiry, err := s.repository.CheckPendingInquiry(ctx, form.WorkEmail) - if err != nil { - s.logger.Error("Failed to check for duplicate inquiry by email", map[string]interface{}{ - "error": err.Error(), - "work_email": form.WorkEmail, - }) - return nil, errors.New("failed to validate inquiry") - } + // existingInquiry, err := s.repository.CheckPendingInquiry(ctx, form.WorkEmail) + // if err != nil { + // s.logger.Error("Failed to check for duplicate inquiry by email", map[string]interface{}{ + // "error": err.Error(), + // "work_email": form.WorkEmail, + // }) + // return nil, errors.New("failed to validate inquiry") + // } - if existingInquiry != nil { - s.logger.Warn("Duplicate inquiry attempt by email", map[string]interface{}{ - "work_email": form.WorkEmail, - "existing_id": existingInquiry.ID, - "existing_status": existingInquiry.Status, - "created_at": existingInquiry.CreatedAt, - }) - return nil, NewDuplicateInquiryError("email", existingInquiry.ID.Hex(), existingInquiry.Status, existingInquiry.CreatedAt) - } + // if existingInquiry != nil { + // s.logger.Warn("Duplicate inquiry attempt by email", map[string]interface{}{ + // "work_email": form.WorkEmail, + // "existing_id": existingInquiry.ID, + // "existing_status": existingInquiry.Status, + // "created_at": existingInquiry.CreatedAt, + // }) + // return nil, NewDuplicateInquiryError("email", existingInquiry.ID.Hex(), existingInquiry.Status, existingInquiry.CreatedAt) + // } // Check for duplicate pending inquiries by phone number - existingInquiryByPhone, err := s.repository.CheckPendingInquiryByPhone(ctx, form.PhoneNumber) - if err != nil { - s.logger.Error("Failed to check for duplicate inquiry by phone", map[string]interface{}{ - "error": err.Error(), - "phone_number": form.PhoneNumber, - }) - return nil, errors.New("failed to validate inquiry") - } + // existingInquiryByPhone, err := s.repository.CheckPendingInquiryByPhone(ctx, form.PhoneNumber) + // if err != nil { + // s.logger.Error("Failed to check for duplicate inquiry by phone", map[string]interface{}{ + // "error": err.Error(), + // "phone_number": form.PhoneNumber, + // }) + // return nil, errors.New("failed to validate inquiry") + // } - if existingInquiryByPhone != nil { - s.logger.Warn("Duplicate inquiry attempt by phone", map[string]interface{}{ - "phone_number": form.PhoneNumber, - "existing_id": existingInquiryByPhone.ID, - "existing_status": existingInquiryByPhone.Status, - "created_at": existingInquiryByPhone.CreatedAt, - }) - return nil, NewDuplicateInquiryError("phone", existingInquiryByPhone.ID.Hex(), existingInquiryByPhone.Status, existingInquiryByPhone.CreatedAt) - } + // if existingInquiryByPhone != nil { + // s.logger.Warn("Duplicate inquiry attempt by phone", map[string]interface{}{ + // "phone_number": form.PhoneNumber, + // "existing_id": existingInquiryByPhone.ID, + // "existing_status": existingInquiryByPhone.Status, + // "created_at": existingInquiryByPhone.CreatedAt, + // }) + // return nil, NewDuplicateInquiryError("phone", existingInquiryByPhone.ID.Hex(), existingInquiryByPhone.Status, existingInquiryByPhone.CreatedAt) + // } // Create inquiry entity inquiry := &Inquiry{ @@ -87,7 +91,7 @@ func (s *inquiryService) Create(ctx context.Context, form *CreateInquiryForm) (* } // Save to database - err = s.repository.Create(ctx, inquiry) + err := s.repository.Create(ctx, inquiry) if err != nil { s.logger.Error("Failed to create inquiry", map[string]interface{}{ "error": err.Error(), @@ -97,6 +101,51 @@ func (s *inquiryService) Create(ctx context.Context, form *CreateInquiryForm) (* return nil, errors.New("failed to create inquiry") } + s.sdk.SendNotification(ctx, ¬ification.NotificationRequest{ + UserID: inquiry.ID.Hex(), + Title: fmt.Sprintf("New Inquiry from %s", inquiry.CompanyName), + Message: GenerateNewInquiryEmailTemplate(&EmailTemplateData{ + FullName: inquiry.FullName, + CompanyName: inquiry.CompanyName, + WorkEmail: inquiry.WorkEmail, + PhoneNumber: inquiry.PhoneNumber, + InquiryID: inquiry.ID.Hex(), + CreatedAt: inquiry.CreatedAt, + CompanyLogo: "", + CompanyURL: "https://opplens.com", + SupportEmail: "info@opplens.com", + }), + Type: "alert", + Priority: "important", + EventType: notification.EventTypeEmail, + Methods: notification.NotificationMethods{ + Email: "info@opplens.com", + }, + }) + + // TODO: Should be removed only for testing + s.sdk.SendNotification(ctx, ¬ification.NotificationRequest{ + UserID: inquiry.ID.Hex(), + Title: fmt.Sprintf("New Inquiry from %s", inquiry.CompanyName), + Message: GenerateNewInquiryEmailTemplate(&EmailTemplateData{ + FullName: inquiry.FullName, + CompanyName: inquiry.CompanyName, + WorkEmail: inquiry.WorkEmail, + PhoneNumber: inquiry.PhoneNumber, + InquiryID: inquiry.ID.Hex(), + CreatedAt: inquiry.CreatedAt, + CompanyLogo: "", + CompanyURL: "https://opplens.com", + SupportEmail: "info@opplens.com", + }), + Type: "alert", + Priority: "important", + EventType: notification.EventTypeEmail, + Methods: notification.NotificationMethods{ + Email: "nakhostin.nima1998@gmail.com", + }, + }) + s.logger.Info("Inquiry created successfully", map[string]interface{}{ "inquiry_id": inquiry.ID, "work_email": inquiry.WorkEmail, @@ -133,9 +182,9 @@ func (s *inquiryService) GetByID(ctx context.Context, id string) (*InquiryRespon // UpdateStatus updates the status of an inquiry func (s *inquiryService) UpdateStatus(ctx context.Context, id string, form *UpdateInquiryStatusForm, changedBy string) (*InquiryResponse, error) { s.logger.Info("Updating inquiry status", map[string]interface{}{ - "inquiry_id": id, - "new_status": form.Status, - "changed_by": changedBy, + "inquiry_id": id, + "new_status": form.Status, + "changed_by": changedBy, }) // Validate status transition