Fix/Description_box

.gitignore

@@ -24,4 +24,8 @@ go.work.sum
 .env
 .vscode
 serviceAccountKey.json
-logs/*
+<<<<<<< HEAD
+logs/*
+=======
+logs/*
+>>>>>>> 1828b7728c5becfba917cec01f0afb82d92d097e

cmd/main.go

@@ -132,7 +132,11 @@ func startApp() (err error) {
 		logger.WithField("err", err.Error()).Error("CronJob Initialize failed")
 		return
 	}
-	defer scheduler.Shutdown()
+	defer func() {
+		if err := scheduler.Shutdown(); err != nil {
+			log.Error(ctx, "Scheduler shutdown failed: %s", err.Error())
+		}
+	}()
 	//initialize router
 	router := api.NewRouter(services)
 

internal/app/appreciation/service.go

@@ -8,6 +8,7 @@ import (
 	"github.com/joshsoftware/peerly-backend/internal/app/notification"
 	user "github.com/joshsoftware/peerly-backend/internal/app/users"
 	"github.com/joshsoftware/peerly-backend/internal/pkg/apperrors"
+	"github.com/joshsoftware/peerly-backend/internal/pkg/config"
 	"github.com/joshsoftware/peerly-backend/internal/pkg/constants"
 	"github.com/joshsoftware/peerly-backend/internal/pkg/dto"
 	"github.com/joshsoftware/peerly-backend/internal/pkg/utils"
@@ -41,6 +42,7 @@ func NewService(appreciationRepo repository.AppreciationStorer, coreValuesRepo r
 
 func (apprSvc *service) CreateAppreciation(ctx context.Context, appreciation dto.Appreciation) (dto.Appreciation, error) {
 
+	logger.Debug(ctx, "svc: CreateAppreciation: appreciation: ", appreciation)
 	//add quarter
 	appreciation.Quarter = utils.GetQuarter()
 	logger.Debug(ctx, "appreciationService CreateAppreciation: appreciation: ", appreciation)
@@ -305,13 +307,13 @@ func (apprSvc *service) sendEmailForBadgeAllocation(userBadgeDetails []repositor
 		var badgeImageUrl string
 		switch userBadgeDetail.BadgeName.String {
 		case "Bronze":
-			badgeImageUrl = "bronzeBadge"
+			badgeImageUrl = fmt.Sprint(config.PeerlyBaseUrl() + constants.BronzeBadgeIconImagePath)
 		case "Silver":
-			badgeImageUrl = "silverBadge"
+			badgeImageUrl = fmt.Sprint(config.PeerlyBaseUrl() + constants.SilverBadgeIconImagePath)
 		case "Gold":
-			badgeImageUrl = "goldBadge"
+			badgeImageUrl = fmt.Sprint(config.PeerlyBaseUrl() + constants.GoldBadgeIconImagePath)
 		case "Platinum":
-			badgeImageUrl = "platinumBadge"
+			badgeImageUrl = fmt.Sprint(config.PeerlyBaseUrl() + constants.PlatinumIconImagePath)
 		}
 
 		// repository.UserBadgeDetails

internal/app/badges/service.go

@@ -2,6 +2,7 @@ package badges
 
 import (
 	"context"
+	"time"
 
 	"github.com/joshsoftware/peerly-backend/internal/pkg/apperrors"
 	"github.com/joshsoftware/peerly-backend/internal/pkg/constants"
@@ -100,3 +101,10 @@ func mapDbToSvc(dbResp repository.Badge, user dto.GetUserByIdResp) (svcResp dto.
 	svcResp.UpdatedBy = user.FirstName + " " + user.LastName
 	return
 }
+
+func GetQuarterStartUnixTime() int64 {
+	// Example function to get the Unix timestamp of the start of the quarter
+	now := time.Now()
+	quarterStart := time.Date(now.Year(), (now.Month()-1)/3*3+1, 1, 0, 0, 0, 0, time.UTC)
+	return quarterStart.Unix() * 1000 // convert to milliseconds
+}

internal/app/cronjob/monthlyUpdateData.go

@@ -18,8 +18,8 @@ const MONTHLY_JOB = "MONTHLY_JOB"
 var MONTHLY_CRON_JOB_INTERVAL_MONTHS = 1
 
 var MonthlyJobTiming = JobTime{
-	hours:   23,
-	minutes: 59,
+	hours:   11,
+	minutes: 26,
 	seconds: 0,
 }
 
@@ -60,7 +60,7 @@ func (cron *MonthlyJob) Schedule() error {
 	)
 	cron.scheduler.Start()
 	if err != nil {
-		logger.Warn(context.TODO(), fmt.Sprintf("error occurred while scheduling %s, message %+v", cron.name, err.Error()))
+		logger.Warn(context.Background(), fmt.Sprintf("error occurred while scheduling %s, message %+v", cron.name, err.Error()))
 		return err
 	}
 	return nil
@@ -72,22 +72,20 @@ func (cron *MonthlyJob) Task(ctx context.Context) {
 	for i := 0; i < 3; i++ {
 		logger.Info(ctx, "cron job attempt:", i+1)
 		err = cron.userService.UpdateRewardQuota(ctx)
+		logger.Error(ctx, "err: ", err)
 		if err == nil {
 			sendRewardQuotaRefilledNotificationToAll()
 			return
 		}
 		log.Info(ctx, fmt.Sprintf("cronjob fail error: %v", err.Error()))
 	}
-	// return err
-	return
 }
 
 func sendRewardQuotaRefilledNotificationToAll() {
 	msg := notification.Message{
 		Title: "Reward Quota is Refilled",
 		Body:  "Your reward quota is reset! You now recognize your colleagues.",
 	}
-
 	logger.Debug(context.Background(), "msg:", msg)
 	msg.SendNotificationToTopic("peerly")
 }

internal/app/cronjob/updateDailyData.go

@@ -7,6 +7,7 @@ import (
 	"github.com/go-co-op/gocron/v2"
 	apprSvc "github.com/joshsoftware/peerly-backend/internal/app/appreciation"
 	orgSvc "github.com/joshsoftware/peerly-backend/internal/app/organizationConfig"
+	"github.com/joshsoftware/peerly-backend/internal/pkg/constants"
 	logger "github.com/joshsoftware/peerly-backend/internal/pkg/logger"
 )
 
@@ -63,8 +64,8 @@ func (cron *DailyJob) Schedule() error {
 	}
 	return nil
 }
-
 func (cron *DailyJob) Task(ctx context.Context) {
+	ctx = context.WithValue(ctx, constants.RequestID, "dailyUpdate")
 	logger.Info(ctx, "in daily job task")
 
 	orgInfo, err := cron.organizationConfigService.GetOrganizationConfig(ctx)

internal/app/grades/service.go

@@ -2,6 +2,7 @@ package grades
 
 import (
 	"context"
+	"time"
 
 	"github.com/joshsoftware/peerly-backend/internal/pkg/apperrors"
 	"github.com/joshsoftware/peerly-backend/internal/pkg/constants"
@@ -96,3 +97,10 @@ func mapDbToSvc(dbResp repository.Grade, user dto.GetUserByIdResp) (svcResp dto.
 	svcResp.UpdatedBy = user.FirstName + " " + user.LastName
 	return
 }
+
+func GetQuarterStartUnixTime() int64 {
+	// Example function to get the Unix timestamp of the start of the quarter
+	now := time.Now()
+	quarterStart := time.Date(now.Year(), (now.Month()-1)/3*3+1, 1, 0, 0, 0, 0, time.UTC)
+	return quarterStart.Unix() * 1000 // convert to milliseconds
+}

internal/app/reportAppreciations/service.go

@@ -356,19 +356,22 @@ func mapDbAppreciationsToSvcAppreciations(dbApp repository.ListReportedAppreciat
 
 func sendReportEmail(senderEmail string, senderFirstName string, senderLastName string, apprSenderFirstName string, apprSenderLastName string, apprReceiverFirstName string, apprReceiverLastName string, reportingComment string) error {
 
+	ctx := context.Background()
+	ctx = context.WithValue(ctx, constants.RequestID, "reportEmail")
 	templateData := struct {
 		SenderName               string
 		ReportingComment         string
 		AppreciationSenderName   string
 		AppreciationReceiverName string
+		ReportIconImageURL       string
 	}{
 		SenderName:               fmt.Sprint(senderFirstName, " ", senderLastName),
 		ReportingComment:         reportingComment,
 		AppreciationSenderName:   fmt.Sprint(apprSenderFirstName, " ", apprSenderLastName),
 		AppreciationReceiverName: fmt.Sprint(apprReceiverFirstName, " ", apprReceiverLastName),
+		ReportIconImageURL:       fmt.Sprint(config.PeerlyBaseUrl() + constants.CheckIconLogo),
 	}
 
-	ctx := context.Background()
 	logger.Info(ctx, "report sender email: ---------> ", senderEmail)
 	mailReq := email.NewMail([]string{senderEmail}, []string{"dl_peerly.support@joshsoftware.com"}, []string{}, "🙏 Thanks for Your Feedback! We’re On It! 🔧")
 	mailReq.ParseTemplate("./internal/app/email/templates/reportAppreciation.html", templateData)

internal/app/reward/service.go

@@ -163,6 +163,7 @@ func (rwrdSvc *service) sendRewardNotificationToSender(ctx context.Context, user
 
 	logger.Debug(ctx, " rewardService: sendRewardNotificationToSender: user: ", user)
 	notificationTokens, err := rwrdSvc.userRepo.ListDeviceTokensByUserID(ctx, user.UserId)
+	logger.Debug(ctx, " notificationTokens: ", notificationTokens)
 	if err != nil {
 		logger.Errorf(ctx, "err in getting device tokens: %v", err)
 		return

internal/pkg/apperrors/errors.go

@@ -68,7 +68,7 @@ const (
 	InvalidRewardMultiplier            = CustomError("Reward multiplier should greater than 1")
 	InvalidRewardQuotaRenewalFrequency = CustomError("Reward renewal frequency should greater than 1")
 	InvalidTimezone                    = CustomError("Enter valid timezone")
-	DescriptionLengthExceed            = CustomError("Maximum character length of 500 exceeded")
+	DescriptionLengthExceed            = CustomError("The description should be at least 150 characters long")
 	InvalidPageSize                    = CustomError("Invalid page size")
 	InvalidPage                        = CustomError("Invalid page value")
 	NegativeGradePoints                = CustomError("Grade points cannot be negative")

internal/pkg/constants/system.go

@@ -62,4 +62,15 @@ const (
 
 const DefaultOrgID = 1
 
+// EmailTemplate Icon url
+const (
+	BronzeBadgeIconImagePath        = "/peerly/assets/bronzeBadge.png"
+	SilverBadgeIconImagePath        = "/peerly/assets/silverBadge.png"
+	GoldBadgeIconImagePath          = "/peerly/assets/goldBadge.png"
+	PlatinumIconImagePath           = "/peerly/assets/platinumBadge.png"
+	CheckIconImagePath              = "/peerly/assets/checkIcon.png"
+	ClosedEnvelopeIconImagePath     = "/peerly/assets/closedEnvelopeIcon.png"
+	OpenEnvelopeIconImagePath       = "/peerly/assets/openEnvelopeIcon.png"
+	RewardQuotaRenewalIconImagePath = "/peerly/assets/rewardQuotaRenewal.png"
+)
 const CheckIconLogo = "/peerly/assets/checkIcon.png"

internal/pkg/dto/appreciation.go

@@ -75,7 +75,7 @@ func (appr *Appreciation) ValidateCreateAppreciation() (err error) {
 		return apperrors.DescFieldBlank
 	}
 
-	if len(appr.Description) > 500 {
+	if len(appr.Description) < 150 {
 		return apperrors.DescriptionLengthExceed
 	}
 

logs/2024-08-26_13-15-07_peerly_backend.log

@@ -0,0 +1 @@
+time="2024-08-26T13:15:07+05:30" level=info msg="req_id: [Starting Peerly Application...]"