fix: update golang generic and kafka three_primary key

samwang0723 · Sep 20, 2024 · 1f9131d · 1f9131d
1 parent 3bea195
commit 1f9131d
Show file tree

Hide file tree

Showing 25 changed files with 60 additions and 87 deletions.
diff --git a/internal/app/crawler/broadcastor.go b/internal/app/crawler/broadcastor.go
@@ -39,7 +39,7 @@ func (b *broadcastor) Process(_ context.Context, pipe pipeline.Payload) (pipelin
 	if payload.Strategy == convert.StakeConcentration {
 		if st := b.cacheInMemory(payload.ParsedContent); st != nil {
 			intercept = convert.InterceptData{
-				Data: &[]interface{}{st},
+				Data: &[]any{st},
 				Type: payload.Strategy,
 			}
 		}
@@ -57,7 +57,7 @@ func (b *broadcastor) Process(_ context.Context, pipe pipeline.Payload) (pipelin
 	return pipe, nil
 }
 
-func (b *broadcastor) cacheInMemory(data *[]interface{}) *entity.StakeConcentration {
+func (b *broadcastor) cacheInMemory(data *[]any) *entity.StakeConcentration {
 	for _, v := range *data {
 		if val, ok := v.(*entity.StakeConcentration); ok {
 			b.memCache[val.StockID] = append(b.memCache[val.StockID], val)

diff --git a/internal/app/crawler/payload.go b/internal/app/crawler/payload.go
@@ -30,13 +30,13 @@ var (
 	_ pipeline.Payload = (*crawlerPayload)(nil)
 
 	payloadPool = sync.Pool{
-		New: func() interface{} { return new(crawlerPayload) },
+		New: func() any { return new(crawlerPayload) },
 	}
 )
 
 type crawlerPayload struct {
 	RetrievedAt   time.Time
-	ParsedContent *[]interface{}
+	ParsedContent *[]any
 	URL           string
 	Date          string
 	RawContent    bytes.Buffer

diff --git a/internal/app/entity/convert/broadcast.go b/internal/app/entity/convert/broadcast.go
@@ -1,6 +1,6 @@
 package convert
 
 type InterceptData struct {
-	Data *[]interface{}
+	Data *[]any
 	Type Source
 }
diff --git a/internal/app/entity/convert/concentration.go b/internal/app/entity/convert/concentration.go
@@ -26,7 +26,7 @@ func Concentration() IConvert {
 	return &concentrationImpl{}
 }
 
-func (c *concentrationImpl) Execute(data *Data) interface{} {
+func (c *concentrationImpl) Execute(data *Data) any {
 	var output *entity.StakeConcentration
 	if data == nil || len(data.RawData) < 7 {
 		return output

diff --git a/internal/app/entity/convert/convert.go b/internal/app/entity/convert/convert.go
@@ -35,5 +35,5 @@ type Data struct {
 
 // Use strategy pattern to convert entities from parser
 type IConvert interface {
-	Execute(data *Data) interface{}
+	Execute(data *Data) any
 }
diff --git a/internal/app/entity/convert/dailyclose.go b/internal/app/entity/convert/dailyclose.go
@@ -28,7 +28,7 @@ func DailyClose() IConvert {
 	return &dailyCloseImpl{}
 }
 
-func (c *dailyCloseImpl) Execute(data *Data) interface{} {
+func (c *dailyCloseImpl) Execute(data *Data) any {
 	var output *entity.DailyClose
 	if data == nil || len(data.RawData) < 17 {
 		return output

diff --git a/internal/app/entity/convert/stock.go b/internal/app/entity/convert/stock.go
@@ -28,7 +28,7 @@ func Stock() IConvert {
 	return &stockImpl{}
 }
 
-func (c *stockImpl) Execute(data *Data) interface{} {
+func (c *stockImpl) Execute(data *Data) any {
 	var output *entity.Stock
 	if data == nil || len(data.RawData) < maxLength {
 		return output

diff --git a/internal/app/entity/convert/threeprimary.go b/internal/app/entity/convert/threeprimary.go
@@ -27,7 +27,7 @@ func ThreePrimary() IConvert {
 	return &threePrimaryImpl{}
 }
 
-func (c *threePrimaryImpl) Execute(data *Data) interface{} {
+func (c *threePrimaryImpl) Execute(data *Data) any {
 	var output *entity.ThreePrimary
 	if data == nil || len(data.RawData) < 19 {
 		return output

diff --git a/internal/app/entity/stakeconcentration.go b/internal/app/entity/stakeconcentration.go
@@ -23,7 +23,7 @@ import (
 
 //nolint:nolintlint, gochecknoglobals
 var concentrationPool = sync.Pool{
-	New: func() interface{} { return new(StakeConcentration) },
+	New: func() any { return new(StakeConcentration) },
 }
 
 type StakeConcentration struct {

diff --git a/internal/app/entity/threeprimary.go b/internal/app/entity/threeprimary.go
@@ -15,7 +15,7 @@ package entity
 
 type ThreePrimary struct {
 	StockID            string `json:"stockId"`
-	Date               string `json:"exchangeDate"`
+	Date               string `json:"date"`
 	ForeignTradeShares int64  `json:"foreignTradeShares"`
 	TrustTradeShares   int64  `json:"trustTradeShares"`
 	DealerTradeShares  int64  `json:"dealerTradeShares"`

diff --git a/internal/app/parser/concentration.go b/internal/app/parser/concentration.go
@@ -35,10 +35,10 @@ type concentrationStrategy struct {
 func (s *concentrationStrategy) Parse(
 	input io.Reader,
 	additional ...string,
-) ([]interface{}, error) {
+) ([]any, error) {
 	var records []string
 
-	var output []interface{}
+	var output []any
 
 	var isColumn, isTitle, startParsing bool
 

diff --git a/internal/app/parser/concentration_test.go b/internal/app/parser/concentration_test.go
@@ -79,7 +79,7 @@ func TestParseConcentration(t *testing.T) {
 			t.Parallel()
 
 			res := &parserImpl{
-				result: &[]interface{}{},
+				result: &[]any{},
 			}
 			res.SetStrategy(convert.StakeConcentration, "2023-01-10")
 			res.Execute(*bytes.NewBuffer([]byte(tt.content)), "https://stockchannelnew.sinotrade.com.tw/z/zc/zco/zco_3704_1.djhtm")

diff --git a/internal/app/parser/csv.go b/internal/app/parser/csv.go
@@ -32,12 +32,12 @@ type csvStrategy struct {
 }
 
 //nolint:nolintlint, cyclop
-func (s *csvStrategy) Parse(input io.Reader, _ ...string) ([]interface{}, error) {
+func (s *csvStrategy) Parse(input io.Reader, _ ...string) ([]any, error) {
 	if s.date == "" {
 		return nil, ErrParseDayMissing
 	}
 
-	var output []interface{}
+	var output []any
 
 	reader := csv.NewReader(input)
 	reader.Comma = ','

diff --git a/internal/app/parser/csv_test.go b/internal/app/parser/csv_test.go
@@ -74,7 +74,7 @@ func TestParseCsv(t *testing.T) {
 			t.Parallel()
 
 			res := &parserImpl{
-				result: &[]interface{}{},
+				result: &[]any{},
 			}
 
 			res.SetStrategy(tt.target, "20211130")

diff --git a/internal/app/parser/parser.go b/internal/app/parser/parser.go
@@ -38,11 +38,11 @@ const (
 type Parser interface {
 	SetStrategy(source convert.Source, additional ...string)
 	Execute(in bytes.Buffer, additional ...string) error
-	Flush() *[]interface{}
+	Flush() *[]any
 }
 
 type Strategy interface {
-	Parse(in io.Reader, additional ...string) ([]interface{}, error)
+	Parse(in io.Reader, additional ...string) ([]any, error)
 }
 
 type Config struct {
@@ -52,13 +52,13 @@ type Config struct {
 type parserImpl struct {
 	cfg      Config
 	strategy Strategy
-	result   *[]interface{}
+	result   *[]any
 }
 
 func New(cfg Config) Parser {
 	res := &parserImpl{
 		cfg:    cfg,
-		result: &[]interface{}{},
+		result: &[]any{},
 	}
 
 	return res
@@ -122,9 +122,9 @@ func (p *parserImpl) Execute(in bytes.Buffer, additional ...string) error {
 	return nil
 }
 
-func (p *parserImpl) Flush() *[]interface{} {
+func (p *parserImpl) Flush() *[]any {
 	res := *p.result
-	p.result = &[]interface{}{}
+	p.result = &[]any{}
 
 	return &res
 }
diff --git a/internal/app/parser/stocks.go b/internal/app/parser/stocks.go
@@ -29,8 +29,8 @@ type htmlStrategy struct {
 }
 
 //nolint:nolintlint, cyclop, gocognit
-func (s *htmlStrategy) Parse(input io.Reader, _ ...string) ([]interface{}, error) {
-	var output []interface{}
+func (s *htmlStrategy) Parse(input io.Reader, _ ...string) ([]any, error) {
+	var output []any
 
 	var records []string
 

diff --git a/internal/app/parser/stocks_test.go b/internal/app/parser/stocks_test.go
@@ -62,7 +62,7 @@ func TestParseHtml(t *testing.T) {
 			t.Parallel()
 
 			res := &parserImpl{
-				result: &[]interface{}{},
+				result: &[]any{},
 			}
 			res.SetStrategy(convert.TwseStockList)
 			err := res.Execute(*bytes.NewBuffer([]byte(tt.content)))

diff --git a/internal/app/server/serve.go b/internal/app/server/serve.go
@@ -216,33 +216,6 @@ func (s *server) Run(ctx context.Context) error {
 			},
 		})
 
-		//nolint:nolintlint, errcheck
-		svc.Handler().CronDownload(ctx, &dto.StartCronjobRequest{
-			Schedule: "30 15 * * 1-5",
-			Types: []convert.Source{
-				convert.TwseDailyClose,
-				convert.TpexDailyClose,
-			},
-		})
-
-		//nolint:nolintlint, errcheck
-		svc.Handler().CronDownload(ctx, &dto.StartCronjobRequest{
-			Schedule: "30 17 * * 1-5",
-			Types: []convert.Source{
-				convert.TwseThreePrimary,
-				convert.TpexThreePrimary,
-			},
-		})
-
-		//nolint:nolintlint, errcheck
-		svc.Handler().CronDownload(ctx, &dto.StartCronjobRequest{
-			Schedule: "40 18 * * 1-5",
-			Types: []convert.Source{
-				convert.TwseThreePrimary,
-				convert.TpexThreePrimary,
-			},
-		})
-
 		requestChan := make(chan *dto.StartCronjobRequest)
 		svc.Handler().ListeningDownloadRequest(ctx, requestChan)
 

diff --git a/internal/app/services/entities.go b/internal/app/services/entities.go
@@ -38,7 +38,7 @@ const (
 //nolint:nolintlint, gochecknoglobals
 var jsoni = jsoniter.ConfigCompatibleWithStandardLibrary
 
-func (s *serviceImpl) DailyCloseThroughKafka(ctx context.Context, objs *[]interface{}) error {
+func (s *serviceImpl) DailyCloseThroughKafka(ctx context.Context, objs *[]any) error {
 	for _, val := range *objs {
 		if res, ok := val.(*entity.DailyClose); ok {
 			b, err := jsoni.Marshal(res)
@@ -67,7 +67,7 @@ func (s *serviceImpl) DailyCloseThroughKafka(ctx context.Context, objs *[]interf
 	return nil
 }
 
-func (s *serviceImpl) StockThroughKafka(ctx context.Context, objs *[]interface{}) error {
+func (s *serviceImpl) StockThroughKafka(ctx context.Context, objs *[]any) error {
 	for _, val := range *objs {
 		if res, ok := val.(*entity.Stock); ok {
 			b, err := jsoni.Marshal(res)
@@ -96,7 +96,7 @@ func (s *serviceImpl) StockThroughKafka(ctx context.Context, objs *[]interface{}
 	return nil
 }
 
-func (s *serviceImpl) ThreePrimaryThroughKafka(ctx context.Context, objs *[]interface{}) error {
+func (s *serviceImpl) ThreePrimaryThroughKafka(ctx context.Context, objs *[]any) error {
 	for _, val := range *objs {
 		if res, ok := val.(*entity.ThreePrimary); ok {
 			b, err := jsoni.Marshal(res)
@@ -127,7 +127,7 @@ func (s *serviceImpl) ThreePrimaryThroughKafka(ctx context.Context, objs *[]inte
 
 func (s *serviceImpl) StakeConcentrationThroughKafka(
 	ctx context.Context,
-	objs *[]interface{},
+	objs *[]any,
 ) error {
 	for _, val := range *objs {
 		if res, ok := val.(*entity.StakeConcentration); ok {