tracking errors are reported to the user

dir01 · Sep 29, 2023 · 1d8a39a · 1d8a39a
1 parent ac8c1a2
commit 1d8a39a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/core/parcels_api.go b/core/parcels_api.go
@@ -3,6 +3,7 @@ package core
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"io"
 	"net/http"
 
@@ -11,6 +12,8 @@ import (
 	"go.uber.org/zap"
 )
 
+var ErrNotFound = errors.New("not found")
+
 type ParcelsAPI struct {
 	apiURL string
 }
@@ -28,6 +31,10 @@ func (api *ParcelsAPI) GetTrackingInfo(ctx context.Context, trackingNumber strin
 		return nil, err
 	}
 
+	if resp.StatusCode == http.StatusNotFound {
+		return nil, ErrNotFound
+	}
+
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err

diff --git a/core/service.go b/core/service.go
@@ -41,10 +41,6 @@ type ServiceImpl struct {
 	updatesChan     chan TrackingUpdate
 }
 
-func (s *ServiceImpl) Updates() chan TrackingUpdate {
-	return s.updatesChan
-}
-
 type Storage interface {
 	SaveTracking(ctx context.Context, tracking *Tracking) (*Tracking, error)
 	GetTrackingsLastPolledBefore(ctx context.Context, t time.Time) ([]*Tracking, error)
@@ -67,6 +63,11 @@ type TrackingUpdate struct {
 	DisplayName       string
 	NewTrackingInfos  []*parcels_api.TrackingInfo
 	NewTrackingEvents []*parcels_api.TrackingEvent
+	TrackingErrors    []error
+}
+
+func (s *ServiceImpl) Updates() chan TrackingUpdate {
+	return s.updatesChan
 }
 
 func (s *ServiceImpl) Start(ctx context.Context) {
@@ -107,7 +108,7 @@ func (s *ServiceImpl) Track(ctx context.Context, userID int64, trackingNumber st
 	if tracking, err := s.storage.SaveTracking(ctx, tracking); err == nil {
 		zapFields := append(zapFields, zap.Int64("tracking_id", tracking.ID), zaperr.ToField(err))
 		s.logger.Info("tracking added", zapFields...)
-		go s.fetchTrackingInfo(ctx, tracking)
+		go s.fetchTrackingInfo(ctx, tracking, true)
 		return nil
 	} else {
 		return zaperr.Wrap(err, "failed to add tracking", zapFields...)
@@ -117,7 +118,7 @@ func (s *ServiceImpl) Track(ctx context.Context, userID int64, trackingNumber st
 // fetchTrackingInfo fetches the tracking info from parcels service
 // and updates the tracking in the storage if required
 // it also publishes any updates to the user
-func (s *ServiceImpl) fetchTrackingInfo(ctx context.Context, tracking *Tracking) {
+func (s *ServiceImpl) fetchTrackingInfo(ctx context.Context, tracking *Tracking, reportErrors bool) {
 	zapFields := []zap.Field{
 		zap.Any("tracking", tracking),
 	}
@@ -126,6 +127,14 @@ func (s *ServiceImpl) fetchTrackingInfo(ctx context.Context, tracking *Tracking)
 	fetchedTrackingInfos, err := s.parcelsAPI.GetTrackingInfo(ctx, tracking.TrackingNumber)
 	if err != nil {
 		s.logger.Error("failed to fetch tracking info", append(zapFields, zaperr.ToField(err))...)
+		if reportErrors {
+			s.updatesChan <- TrackingUpdate{
+				TrackingNumber: tracking.TrackingNumber,
+				UserID:         tracking.UserID,
+				DisplayName:    tracking.DisplayName,
+				TrackingErrors: []error{err},
+			}
+		}
 		return
 	}
 
@@ -164,7 +173,7 @@ func (s *ServiceImpl) poll(ctx context.Context) {
 	}
 	s.logger.Info("polling", zap.Int("trackings_count", len(trackings)))
 	for _, tracking := range trackings {
-		s.fetchTrackingInfo(ctx, tracking)
+		s.fetchTrackingInfo(ctx, tracking, false)
 	}
 }