feat: add archive

commondata/common_tracking_step_type.go

@@ -32,3 +32,5 @@ var CommonTrackingStepTypeEmoji = map[CommonTrackingStepType]string{
 	6: "✅",
 	7: "❗",
 }
+
+var CommonTrackingStepsToArchive = []CommonTrackingStepType{CommonTrackingStepType_DELIVERED}

paczkobot/archive_service.go

@@ -0,0 +1,59 @@
+package paczkobot
+
+import (
+	"fmt"
+
+	"github.com/alufers/paczkobot/commondata"
+)
+
+type ArchiveService struct {
+	App *BotApp
+}
+
+func NewArchiveService(a *BotApp) *ArchiveService {
+	return &ArchiveService{
+		App: a,
+	}
+}
+
+func (s *ArchiveService) FetchAndArchivePackagesForUser(telegramUserID int64) error {
+	followedPackages := []FollowedPackageTelegramUser{}
+
+	if err := s.App.DB.Where("telegram_user_id = ? AND archived = ?", telegramUserID, false).
+		Preload("FollowedPackage").
+		Preload("FollowedPackage.FollowedPackageProviders").
+		Find(&followedPackages).Error; err != nil {
+		return fmt.Errorf("failed to query DB: %w", err)
+	}
+	return s.ArchivePackagesIfNeeded(followedPackages)
+}
+
+//ArchivePackagesIfNeeded checks whether the passed packages meet the criteria to be archived
+//FollowedPackage and FollowedPackage.FollowedPackageProviders must be preloaded
+func (s *ArchiveService) ArchivePackagesIfNeeded(packages []FollowedPackageTelegramUser) error {
+	for _, p := range packages {
+		if s.shouldArchivePackage(p) {
+			if err := s.App.DB.Model(&p).Update("archived", true).Error; err != nil {
+				return fmt.Errorf("failed to update package: %w", err)
+			}
+		}
+	}
+	return nil
+}
+
+func (s *ArchiveService) shouldArchivePackage(p FollowedPackageTelegramUser) bool {
+	if p.Archived {
+		return false
+	}
+	if p.FollowedPackage.Inactive {
+		return true
+	}
+	for _, provider := range p.FollowedPackage.FollowedPackageProviders {
+		for _, s := range commondata.CommonTrackingStepsToArchive {
+			if s == provider.LastStatusCommonType {
+				return true
+			}
+		}
+	}
+	return false
+}

paczkobot/archived_command.go

@@ -0,0 +1,51 @@
+package paczkobot
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+)
+
+type ArchivedCommand struct {
+	App *BotApp
+}
+
+func (s *ArchivedCommand) Aliases() []string {
+	return []string{"/archived"}
+}
+
+func (s *ArchivedCommand) Arguments() []*CommandDefArgument {
+	return []*CommandDefArgument{}
+}
+
+func (s *ArchivedCommand) Help() string {
+	return "prints your archived packages"
+}
+
+func (s *ArchivedCommand) Execute(ctx context.Context, args *CommandArguments) error {
+
+	if err := s.App.ArchiveService.FetchAndArchivePackagesForUser(args.FromUserID); err != nil {
+		log.Printf("failed to fetch and archive packages for user %v: %v", args.FromUserID, err)
+	}
+
+	followedPackages := []FollowedPackageTelegramUser{}
+
+	if err := s.App.DB.Where("telegram_user_id = ? AND archived = ?", args.FromUserID, true).
+		Preload("FollowedPackage").
+		Preload("FollowedPackage.FollowedPackageProviders").
+		Find(&followedPackages).Error; err != nil {
+		return fmt.Errorf("failed to query DB: %w", err)
+	}
+
+	msg := tgbotapi.NewMessage(args.ChatID, fmt.Sprintf(`
+Your archived packages:
+
+%v
+
+`, s.App.PackagePrinterService.PrintPackages(followedPackages)))
+	msg.ParseMode = "HTML"
+	_, err := s.App.Bot.Send(msg)
+	return err
+}

paczkobot/bot_app.go

@@ -23,6 +23,7 @@ type BotApp struct {
 	FollowService         *FollowService
 	InpostScannerService  *InpostScannerService
 	PackagePrinterService *PackagePrinterService
+	ArchiveService        *ArchiveService
 }
 
 func NewBotApp(b *tgbotapi.BotAPI, DB *gorm.DB) (a *BotApp) {
@@ -45,6 +46,7 @@ func NewBotApp(b *tgbotapi.BotAPI, DB *gorm.DB) (a *BotApp) {
 		&InpostScanCommand{App: a},
 		&InpostAccountsCommand{App: a},
 		&InpostQrCommand{App: a},
+		&ArchivedCommand{App: a},
 	}
 	a.NotificationsService = NewNotificationsService(a)
 	a.TrackingService = NewTrackingService(a)
@@ -54,6 +56,7 @@ func NewBotApp(b *tgbotapi.BotAPI, DB *gorm.DB) (a *BotApp) {
 	a.FollowService = NewFollowService(a)
 	a.InpostScannerService = NewInpostScannerService(a)
 	a.PackagePrinterService = NewPackagePrinterService()
+	a.ArchiveService = NewArchiveService(a)
 	return
 }
 
@@ -89,7 +92,7 @@ func (a *BotApp) Run() {
 	go a.TrackingService.RunAutomaticTrackingLoop()
 	for u := range updates {
 		go func(update tgbotapi.Update) {
-			
+
 			if a.AskService.ProcessIncomingMessage(update) {
 				return
 			}

paczkobot/packages_command.go

@@ -3,6 +3,7 @@ package paczkobot
 import (
 	"context"
 	"fmt"
+	"log"
 
 	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
 )
@@ -25,9 +26,13 @@ func (s *PackagesCommand) Help() string {
 
 func (s *PackagesCommand) Execute(ctx context.Context, args *CommandArguments) error {
 
+	if err := s.App.ArchiveService.FetchAndArchivePackagesForUser(args.FromUserID); err != nil {
+		log.Printf("failed to fetch and archive packages for user %v: %v", args.FromUserID, err)
+	}
+
 	followedPackages := []FollowedPackageTelegramUser{}
 
-	if err := s.App.DB.Where("telegram_user_id = ?", args.FromUserID).
+	if err := s.App.DB.Where("telegram_user_id = ? AND archived = ?", args.FromUserID, false).
 		Preload("FollowedPackage").
 		Preload("FollowedPackage.FollowedPackageProviders").
 		Find(&followedPackages).Error; err != nil {
@@ -39,6 +44,7 @@ Your followed packages:
 
 %v
 
+Use /archived to see your archived packages.
 `, s.App.PackagePrinterService.PrintPackages(followedPackages)))
 	msg.ParseMode = "HTML"
 	_, err := s.App.Bot.Send(msg)