Move the LinkChecker interface to the models package

thewizardplusplus · thewizardplusplus · commit 70e0830179b1 · 2021-02-16T23:00:00.000+03:00
diff --git a/checkers/checker_group.go b/checkers/checker_group.go
@@ -3,12 +3,11 @@ package checkers
 import (
 	"context"
 
-	crawler "github.com/thewizardplusplus/go-crawler"
 	"github.com/thewizardplusplus/go-crawler/models"
 )
 
 // CheckerGroup ...
-type CheckerGroup []crawler.LinkChecker
+type CheckerGroup []models.LinkChecker
 
 // CheckLink ...
 func (checkers CheckerGroup) CheckLink(
diff --git a/checkers/checker_group_test.go b/checkers/checker_group_test.go
@@ -36,7 +36,7 @@ func TestCheckerGroup_CheckLink(test *testing.T) {
 		{
 			name: "without failed checkings",
 			checkers: CheckerGroup{
-				func() LinkChecker {
+				func() models.LinkChecker {
 					checker := new(MockLinkChecker)
 					checker.
 						On("CheckLink", context.Background(), models.SourcedLink{
@@ -47,7 +47,7 @@ func TestCheckerGroup_CheckLink(test *testing.T) {
 
 					return checker
 				}(),
-				func() LinkChecker {
+				func() models.LinkChecker {
 					checker := new(MockLinkChecker)
 					checker.
 						On("CheckLink", context.Background(), models.SourcedLink{
@@ -71,7 +71,7 @@ func TestCheckerGroup_CheckLink(test *testing.T) {
 		{
 			name: "with a failed checking",
 			checkers: CheckerGroup{
-				func() LinkChecker {
+				func() models.LinkChecker {
 					checker := new(MockLinkChecker)
 					checker.
 						On("CheckLink", context.Background(), models.SourcedLink{
diff --git a/checkers/mock_gen.go b/checkers/mock_gen.go
@@ -2,7 +2,7 @@ package checkers
 
 import (
 	"github.com/go-log/log"
-	crawler "github.com/thewizardplusplus/go-crawler"
+	"github.com/thewizardplusplus/go-crawler/models"
 	httputils "github.com/thewizardplusplus/go-http-utils"
 )
 
@@ -13,7 +13,7 @@ import (
 // It's used only for mock generating.
 //
 type LinkChecker interface {
-	crawler.LinkChecker
+	models.LinkChecker
 }
 
 //go:generate mockery --name=Logger --inpackage --case=underscore --testonly
diff --git a/crawl.go b/crawl.go
@@ -9,13 +9,6 @@ import (
 	syncutils "github.com/thewizardplusplus/go-sync-utils"
 )
 
-//go:generate mockery --name=LinkChecker --inpackage --case=underscore --testonly
-
-// LinkChecker ...
-type LinkChecker interface {
-	CheckLink(ctx context.Context, link models.SourcedLink) bool
-}
-
 //go:generate mockery --name=LinkHandler --inpackage --case=underscore --testonly
 
 // LinkHandler ...
@@ -26,7 +19,7 @@ type LinkHandler interface {
 // CrawlDependencies ...
 type CrawlDependencies struct {
 	LinkExtractor models.LinkExtractor
-	LinkChecker   LinkChecker
+	LinkChecker   models.LinkChecker
 	LinkHandler   LinkHandler
 	Logger        log.Logger
 }
diff --git a/crawl_test.go b/crawl_test.go
@@ -62,7 +62,7 @@ func TestCrawl(test *testing.T) {
 
 						return extractor
 					}(),
-					LinkChecker: func() LinkChecker {
+					LinkChecker: func() models.LinkChecker {
 						checker := new(MockLinkChecker)
 						checker.
 							On("CheckLink", context.Background(), models.SourcedLink{
@@ -141,7 +141,7 @@ func TestCrawl(test *testing.T) {
 
 						return extractor
 					}(),
-					LinkChecker: func() LinkChecker {
+					LinkChecker: func() models.LinkChecker {
 						checker := new(MockLinkChecker)
 						checker.
 							On("CheckLink", context.Background(), models.SourcedLink{
diff --git a/handle_links_test.go b/handle_links_test.go
@@ -70,7 +70,7 @@ func TestHandleLinksConcurrently(test *testing.T) {
 
 							return extractor
 						}(),
-						LinkChecker: func() LinkChecker {
+						LinkChecker: func() models.LinkChecker {
 							checker := new(MockLinkChecker)
 							checker.
 								On("CheckLink", context.Background(), models.SourcedLink{
@@ -184,7 +184,7 @@ func TestHandleLinks(test *testing.T) {
 
 							return extractor
 						}(),
-						LinkChecker: func() LinkChecker {
+						LinkChecker: func() models.LinkChecker {
 							checker := new(MockLinkChecker)
 							checker.
 								On("CheckLink", context.Background(), models.SourcedLink{
@@ -289,7 +289,7 @@ func TestHandleLink(test *testing.T) {
 
 							return extractor
 						}(),
-						LinkChecker: func() LinkChecker {
+						LinkChecker: func() models.LinkChecker {
 							checker := new(MockLinkChecker)
 							checker.
 								On("CheckLink", context.Background(), models.SourcedLink{
@@ -352,7 +352,7 @@ func TestHandleLink(test *testing.T) {
 
 							return extractor
 						}(),
-						LinkChecker: func() LinkChecker {
+						LinkChecker: func() models.LinkChecker {
 							checker := new(MockLinkChecker)
 							checker.
 								On("CheckLink", context.Background(), models.SourcedLink{
diff --git a/handlers/checked_handler.go b/handlers/checked_handler.go
@@ -9,7 +9,7 @@ import (
 
 // CheckedHandler ...
 type CheckedHandler struct {
-	LinkChecker crawler.LinkChecker
+	LinkChecker models.LinkChecker
 	LinkHandler crawler.LinkHandler
 }
 
diff --git a/handlers/checked_handler_test.go b/handlers/checked_handler_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestCheckedHandler_HandleLink(test *testing.T) {
 	type fields struct {
-		LinkChecker crawler.LinkChecker
+		LinkChecker models.LinkChecker
 		LinkHandler crawler.LinkHandler
 	}
 	type args struct {
@@ -27,7 +27,7 @@ func TestCheckedHandler_HandleLink(test *testing.T) {
 		{
 			name: "with a passed checking",
 			fields: fields{
-				LinkChecker: func() crawler.LinkChecker {
+				LinkChecker: func() models.LinkChecker {
 					checker := new(MockLinkChecker)
 					checker.
 						On("CheckLink", context.Background(), models.SourcedLink{
@@ -61,7 +61,7 @@ func TestCheckedHandler_HandleLink(test *testing.T) {
 		{
 			name: "with a not passed checking",
 			fields: fields{
-				LinkChecker: func() crawler.LinkChecker {
+				LinkChecker: func() models.LinkChecker {
 					checker := new(MockLinkChecker)
 					checker.
 						On("CheckLink", context.Background(), models.SourcedLink{
diff --git a/handlers/mock_gen.go b/handlers/mock_gen.go
@@ -2,6 +2,7 @@ package handlers
 
 import (
 	crawler "github.com/thewizardplusplus/go-crawler"
+	"github.com/thewizardplusplus/go-crawler/models"
 )
 
 //go:generate mockery --name=LinkChecker --inpackage --case=underscore --testonly
@@ -11,7 +12,7 @@ import (
 // It's used only for mock generating.
 //
 type LinkChecker interface {
-	crawler.LinkChecker
+	models.LinkChecker
 }
 
 //go:generate mockery --name=LinkHandler --inpackage --case=underscore --testonly
diff --git a/mock_gen.go b/mock_gen.go
@@ -16,6 +16,16 @@ type LinkExtractor interface {
 	models.LinkExtractor
 }
 
+//go:generate mockery --name=LinkChecker --inpackage --case=underscore --testonly
+
+// LinkChecker ...
+//
+// It's used only for mock generating.
+//
+type LinkChecker interface {
+	models.LinkChecker
+}
+
 //go:generate mockery --name=Waiter --inpackage --case=underscore --testonly
 
 // Waiter ...
diff --git a/models/models.go b/models/models.go
@@ -14,3 +14,8 @@ type SourcedLink struct {
 type LinkExtractor interface {
 	ExtractLinks(ctx context.Context, threadID int, link string) ([]string, error)
 }
+
+// LinkChecker ...
+type LinkChecker interface {
+	CheckLink(ctx context.Context, link SourcedLink) bool
+}

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package checkers`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/go-log/log"`
`5`		`- crawler "github.com/thewizardplusplus/go-crawler"`
	`5`	`+ "github.com/thewizardplusplus/go-crawler/models"`
`6`	`6`	`httputils "github.com/thewizardplusplus/go-http-utils"`
`7`	`7`	`)`
`8`	`8`
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`// It's used only for mock generating.`
`14`	`14`	`//`
`15`	`15`	`type LinkChecker interface {`
`16`		`- crawler.LinkChecker`
	`16`	`+ models.LinkChecker`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`//go:generate mockery --name=Logger --inpackage --case=underscore --testonly`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`// CheckedHandler ...`
`11`	`11`	`type CheckedHandler struct {`
`12`		`- LinkChecker crawler.LinkChecker`
	`12`	`+ LinkChecker models.LinkChecker`
`13`	`13`	`LinkHandler crawler.LinkHandler`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package handlers`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`crawler "github.com/thewizardplusplus/go-crawler"`
	`5`	`+ "github.com/thewizardplusplus/go-crawler/models"`
`5`	`6`	`)`
`6`	`7`
`7`	`8`	`//go:generate mockery --name=LinkChecker --inpackage --case=underscore --testonly`
`@@ -11,7 +12,7 @@ import (`
`11`	`12`	`// It's used only for mock generating.`
`12`	`13`	`//`
`13`	`14`	`type LinkChecker interface {`
`14`		`- crawler.LinkChecker`
	`15`	`+ models.LinkChecker`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`//go:generate mockery --name=LinkHandler --inpackage --case=underscore --testonly`
Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,8 @@ type SourcedLink struct {`
`14`	`14`	`type LinkExtractor interface {`
`15`	`15`	`ExtractLinks(ctx context.Context, threadID int, link string) ([]string, error)`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+// LinkChecker ...`
	`19`	`+type LinkChecker interface {`
	`20`	`+ CheckLink(ctx context.Context, link SourcedLink) bool`
	`21`	`+}`