rework

awakari · May 23, 2023 · 992f29d · 992f29d
1 parent e9cd692
commit 992f29d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/converter.go → converter/converter.go b/converter.go → converter/converter.go
@@ -1,4 +1,4 @@
-package main
+package converter
 
 import (
 	"github.com/SlyMarbo/rss"

diff --git a/converter_logging.go → converter/converter_logging.go b/converter_logging.go → converter/converter_logging.go
@@ -1,4 +1,4 @@
-package main
+package converter
 
 import (
 	"fmt"

diff --git a/main.go b/main.go
@@ -10,7 +10,9 @@ import (
 	"net/http"
 	"os"
 	"producer-rss/config"
+	"producer-rss/converter"
 	"producer-rss/feeds"
+	"producer-rss/producer"
 	"time"
 )
 
@@ -77,11 +79,12 @@ func main() {
 	if err != nil {
 		log.Error(fmt.Sprintf("failed to fetch the feed @ %s:", cfg.Feed.Url), err)
 	}
+	log.Info(fmt.Sprintf("feed contains %d items to process", len(feed.Items)))
 	//
-	conv := NewConverter(cfg.Message)
-	conv = NewConverterLogging(conv, log)
-	prod := NewProducer(feed, feedUpdTime, conv, ws, cfg.Api.Writer.Backoff)
-	prod = NewProducerLogging(prod, log)
+	conv := converter.NewConverter(cfg.Message)
+	conv = converter.NewConverterLogging(conv, log)
+	prod := producer.NewProducer(feed, feedUpdTime, conv, ws, cfg.Api.Writer.Backoff)
+	prod = producer.NewProducerLogging(prod, log)
 	//
 	var newFeedUpdTime time.Time
 	if err == nil {

diff --git a/producer.go → producer/producer.go b/producer.go → producer/producer.go
@@ -1,11 +1,13 @@
-package main
+package producer
 
 import (
 	"context"
 	"errors"
+	"fmt"
 	"github.com/SlyMarbo/rss"
 	"github.com/awakari/client-sdk-go/model"
 	"github.com/cloudevents/sdk-go/binding/format/protobuf/v2/pb"
+	"producer-rss/converter"
 	"time"
 )
 
@@ -16,12 +18,12 @@ type Producer interface {
 type producer struct {
 	feed          *rss.Feed
 	timeMin       time.Time
-	conv          Converter
+	conv          converter.Converter
 	output        model.WriteStream[*pb.CloudEvent]
 	outputBackoff time.Duration
 }
 
-func NewProducer(feed *rss.Feed, timeMin time.Time, conv Converter, output model.WriteStream[*pb.CloudEvent], outputBackoff time.Duration) Producer {
+func NewProducer(feed *rss.Feed, timeMin time.Time, conv converter.Converter, output model.WriteStream[*pb.CloudEvent], outputBackoff time.Duration) Producer {
 	return producer{
 		feed:          feed,
 		timeMin:       timeMin,
@@ -48,6 +50,8 @@ func (p producer) getNewMessages() (msgs []*pb.CloudEvent, nextTime time.Time, e
 			msg, itemErr = p.conv.Convert(p.feed, item)
 			msgs = append(msgs, msg)
 			err = errors.Join(err, itemErr)
+		} else {
+			fmt.Printf("item date %s is before the min time %s\n", item.Date.Format(time.RFC3339), p.timeMin.Format(time.RFC3339))
 		}
 		if nextTime.Before(item.Date) {
 			nextTime = item.Date

diff --git a/producer_logging.go → producer/producer_logging.go b/producer_logging.go → producer/producer_logging.go
@@ -1,4 +1,4 @@
-package main
+package producer
 
 import (
 	"context"