diff --git a/Dockerfile b/Dockerfile index 956ad07..90da879 100644 --- a/Dockerfile +++ b/Dockerfile @@ -126,6 +126,9 @@ COPY --from=builder /app/static /app/static COPY --from=builder /app/migrations /app/migrations COPY --from=builder /app/seeds /app/seeds +# Copy push notification certificates +COPY --from=builder /app/push_certs /app/push_certs + # Copy admin panel standalone build (Next.js recommended layout) COPY --from=admin-builder /app/.next/standalone/ /app/ COPY --from=admin-builder /app/public /app/public diff --git a/internal/repositories/task_repo.go b/internal/repositories/task_repo.go index 231fd2e..1b4db2c 100644 --- a/internal/repositories/task_repo.go +++ b/internal/repositories/task_repo.go @@ -233,7 +233,7 @@ func (r *TaskRepository) GetKanbanData(residenceID uint, daysThreshold int) (*mo { Name: "completed_tasks", DisplayName: "Completed", - ButtonTypes: []string{"view"}, + ButtonTypes: []string{}, Icons: map[string]string{"ios": "checkmark.circle", "android": "CheckCircle"}, Color: "#34C759", Tasks: completed, @@ -360,7 +360,7 @@ func (r *TaskRepository) GetKanbanDataForMultipleResidences(residenceIDs []uint, { Name: "completed_tasks", DisplayName: "Completed", - ButtonTypes: []string{"view"}, + ButtonTypes: []string{}, Icons: map[string]string{"ios": "checkmark.circle", "android": "CheckCircle"}, Color: "#34C759", Tasks: completed, diff --git a/internal/services/notification_service.go b/internal/services/notification_service.go index e97b8b5..b8cc076 100644 --- a/internal/services/notification_service.go +++ b/internal/services/notification_service.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "errors" + "strconv" "gorm.io/gorm" @@ -120,7 +121,7 @@ func (s *NotificationService) CreateAndSendNotification(ctx context.Context, use pushData[k] = string(jsonVal) } } - pushData["notification_id"] = string(rune(notification.ID)) + pushData["notification_id"] = strconv.FormatUint(uint64(notification.ID), 10) // Send push notification if s.pushClient != nil {