Skip to content

Commit 1c8fe2b

Browse files
theandrew168theandrew168
committed
Rename service package to job (for now)
1 parent 5950fbe commit 1c8fe2b

8 files changed

Lines changed: 30 additions & 30 deletions

File tree

backend/service/session.go renamed to backend/job/session.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package service
1+
package job
22

33
import (
44
"context"
@@ -35,7 +35,7 @@ func (s *SessionService) Run(ctx context.Context) error {
3535
}
3636

3737
// Then run again every "internal" until stopped (by the context being canceled).
38-
ticker := time.NewTicker(SyncInterval)
38+
ticker := time.NewTicker(ClearExpiredSessionsInterval)
3939
defer ticker.Stop()
4040

4141
for {

backend/service/session_test.go renamed to backend/job/session_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package service_test
1+
package job_test
22

33
import (
44
"testing"
55
"time"
66

7+
"github.com/theandrew168/bloggulus/backend/job"
78
"github.com/theandrew168/bloggulus/backend/model"
89
"github.com/theandrew168/bloggulus/backend/postgres"
9-
"github.com/theandrew168/bloggulus/backend/service"
1010
"github.com/theandrew168/bloggulus/backend/test"
1111
)
1212

@@ -36,7 +36,7 @@ func TestClearExpiredSessions(t *testing.T) {
3636
err = repo.Session().Create(sessionNew)
3737
test.AssertNilError(t, err)
3838

39-
s := service.NewSessionService(repo)
39+
s := job.NewSessionService(repo)
4040
err = s.ClearExpiredSessions()
4141
test.AssertNilError(t, err)
4242

backend/service/sync.go renamed to backend/job/sync.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package service
1+
package job
22

33
import (
44
"context"

backend/service/sync_test.go renamed to backend/job/sync_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package service_test
1+
package job_test
22

33
import (
44
"testing"
@@ -10,8 +10,8 @@ import (
1010
feedMock "github.com/theandrew168/bloggulus/backend/feed/mock"
1111
"github.com/theandrew168/bloggulus/backend/fetch"
1212
fetchMock "github.com/theandrew168/bloggulus/backend/fetch/mock"
13+
"github.com/theandrew168/bloggulus/backend/job"
1314
"github.com/theandrew168/bloggulus/backend/model"
14-
"github.com/theandrew168/bloggulus/backend/service"
1515
"github.com/theandrew168/bloggulus/backend/test"
1616
"github.com/theandrew168/bloggulus/backend/timeutil"
1717
)
@@ -30,7 +30,7 @@ func TestFilterSyncableBlogs(t *testing.T) {
3030

3131
blogs := []*model.Blog{pastBlog, presentBlog, futureBlog}
3232

33-
syncableBlogs := service.FilterSyncableBlogs(blogs, now)
33+
syncableBlogs := job.FilterSyncableBlogs(blogs, now)
3434
test.AssertEqual(t, len(syncableBlogs), 1)
3535

3636
var syncableBlogIDs []uuid.UUID
@@ -50,7 +50,7 @@ func TestUpdateCacheHeaders(t *testing.T) {
5050
LastModified: "bar",
5151
}
5252

53-
changed := service.UpdateCacheHeaders(blog, resp)
53+
changed := job.UpdateCacheHeaders(blog, resp)
5454
test.AssertEqual(t, changed, true)
5555
test.AssertEqual(t, blog.ETag(), "foo")
5656
test.AssertEqual(t, blog.LastModified(), "bar")
@@ -65,7 +65,7 @@ func TestUpdateCacheHeadersDoesNotClear(t *testing.T) {
6565
LastModified: "",
6666
}
6767

68-
changed := service.UpdateCacheHeaders(blog, resp)
68+
changed := job.UpdateCacheHeaders(blog, resp)
6969
test.AssertEqual(t, changed, false)
7070
test.AssertEqual(t, blog.ETag(), blog.ETag())
7171
test.AssertEqual(t, blog.LastModified(), blog.LastModified())
@@ -98,7 +98,7 @@ func TestComparePosts(t *testing.T) {
9898
updatedPost,
9999
}
100100

101-
result, err := service.ComparePosts(blog, knownPosts, feedPosts)
101+
result, err := job.ComparePosts(blog, knownPosts, feedPosts)
102102
test.AssertNilError(t, err)
103103

104104
// Verify that one new post should be created.
@@ -144,7 +144,7 @@ func TestNewBlog(t *testing.T) {
144144
}
145145
feedFetcher := fetchMock.NewFeedFetcher(feeds)
146146

147-
syncService := service.NewSyncService(repo, feedFetcher)
147+
syncService := job.NewSyncService(repo, feedFetcher)
148148

149149
// sync a new blog
150150
blog, err := syncService.SyncBlog(feedBlog.FeedURL)
@@ -188,7 +188,7 @@ func TestExistingBlog(t *testing.T) {
188188
}
189189
feedFetcher := fetchMock.NewFeedFetcher(feeds)
190190

191-
syncService := service.NewSyncService(repo, feedFetcher)
191+
syncService := job.NewSyncService(repo, feedFetcher)
192192

193193
// sync a new blog
194194
blog, err := syncService.SyncBlog(feedBlog.FeedURL)
@@ -247,7 +247,7 @@ func TestUnreachableFeed(t *testing.T) {
247247
feeds := map[string]fetch.FetchFeedResponse{}
248248
feedFetcher := fetchMock.NewFeedFetcher(feeds)
249249

250-
syncService := service.NewSyncService(repo, feedFetcher)
250+
syncService := job.NewSyncService(repo, feedFetcher)
251251

252252
_, err := syncService.SyncBlog(feedURL)
253253
test.AssertErrorIs(t, err, fetch.ErrUnreachableFeed)
@@ -273,7 +273,7 @@ func TestSyncCooldown(t *testing.T) {
273273
}
274274
feedFetcher := fetchMock.NewFeedFetcher(feeds)
275275

276-
syncService := service.NewSyncService(repo, feedFetcher)
276+
syncService := job.NewSyncService(repo, feedFetcher)
277277

278278
// add a blog (sync now)
279279
blog, err := syncService.SyncBlog(feedBlog.FeedURL)
@@ -320,7 +320,7 @@ func TestUpdatePostContent(t *testing.T) {
320320
}
321321
feedFetcher := fetchMock.NewFeedFetcher(feeds)
322322

323-
syncService := service.NewSyncService(repo, feedFetcher)
323+
syncService := job.NewSyncService(repo, feedFetcher)
324324

325325
// sync a new blog
326326
blog, err := syncService.SyncBlog(feedBlog.FeedURL)
@@ -380,7 +380,7 @@ func TestCacheHeaderOverwrite(t *testing.T) {
380380
}
381381
feedFetcher := fetchMock.NewFeedFetcher(feeds)
382382

383-
syncService := service.NewSyncService(repo, feedFetcher)
383+
syncService := job.NewSyncService(repo, feedFetcher)
384384

385385
// sync a new blog
386386
blog, err := syncService.SyncBlog(feedBlog.FeedURL)
@@ -430,7 +430,7 @@ func TestCacheHeaderUpdate(t *testing.T) {
430430
}
431431
feedFetcher := fetchMock.NewFeedFetcher(feeds)
432432

433-
syncService := service.NewSyncService(repo, feedFetcher)
433+
syncService := job.NewSyncService(repo, feedFetcher)
434434

435435
// sync a new blog
436436
blog, err := syncService.SyncBlog(feedBlog.FeedURL)
@@ -447,7 +447,7 @@ func TestCacheHeaderUpdate(t *testing.T) {
447447
}
448448
feedFetcher = fetchMock.NewFeedFetcher(feeds)
449449

450-
syncService = service.NewSyncService(repo, feedFetcher)
450+
syncService = job.NewSyncService(repo, feedFetcher)
451451

452452
// sync the blog again (will see new ETag and LastModified values)
453453
_, err = syncService.SyncBlog(feedBlog.FeedURL)

‎backend/test/helpers.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/theandrew168/bloggulus/backend/fetch"
88
fetchMock "github.com/theandrew168/bloggulus/backend/fetch/mock"
99
"github.com/theandrew168/bloggulus/backend/finder"
10+
"github.com/theandrew168/bloggulus/backend/job"
1011
"github.com/theandrew168/bloggulus/backend/postgres"
1112
"github.com/theandrew168/bloggulus/backend/repository"
12-
"github.com/theandrew168/bloggulus/backend/service"
1313
)
1414

1515
type CloserFunc func()
@@ -54,9 +54,9 @@ func NewSyncService(
5454
t *testing.T,
5555
repo *repository.Repository,
5656
feeds map[string]fetch.FetchFeedResponse,
57-
) *service.SyncService {
57+
) *job.SyncService {
5858
t.Helper()
5959

60-
syncService := service.NewSyncService(repo, fetchMock.NewFeedFetcher(feeds))
60+
syncService := job.NewSyncService(repo, fetchMock.NewFeedFetcher(feeds))
6161
return syncService
6262
}

‎backend/web/blogs.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"github.com/google/uuid"
1111

1212
"github.com/theandrew168/bloggulus/backend/finder"
13+
"github.com/theandrew168/bloggulus/backend/job"
1314
"github.com/theandrew168/bloggulus/backend/postgres"
1415
"github.com/theandrew168/bloggulus/backend/repository"
15-
"github.com/theandrew168/bloggulus/backend/service"
1616
"github.com/theandrew168/bloggulus/backend/web/page"
1717
"github.com/theandrew168/bloggulus/backend/web/util"
1818
)
@@ -49,7 +49,7 @@ func HandleBlogList(find *finder.Finder) http.Handler {
4949
})
5050
}
5151

52-
func HandleBlogCreateForm(repo *repository.Repository, find *finder.Finder, syncService *service.SyncService) http.Handler {
52+
func HandleBlogCreateForm(repo *repository.Repository, find *finder.Finder, syncService *job.SyncService) http.Handler {
5353
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
5454
account, isLoggedIn := util.GetContextAccount(r)
5555
if !isLoggedIn {

‎backend/web/handler.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"github.com/theandrew168/bloggulus/backend/config"
1414
"github.com/theandrew168/bloggulus/backend/fetch"
1515
"github.com/theandrew168/bloggulus/backend/finder"
16+
"github.com/theandrew168/bloggulus/backend/job"
1617
"github.com/theandrew168/bloggulus/backend/repository"
17-
"github.com/theandrew168/bloggulus/backend/service"
1818
"github.com/theandrew168/bloggulus/backend/web/middleware"
1919
"github.com/theandrew168/bloggulus/backend/web/util"
2020
)
@@ -47,7 +47,7 @@ func Handler(
4747
repo *repository.Repository,
4848
find *finder.Finder,
4949
pageFetcher fetch.PageFetcher,
50-
syncService *service.SyncService,
50+
syncService *job.SyncService,
5151
) http.Handler {
5252
mux := http.NewServeMux()
5353

‎main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"github.com/theandrew168/bloggulus/backend/config"
1616
fetch "github.com/theandrew168/bloggulus/backend/fetch/web"
1717
"github.com/theandrew168/bloggulus/backend/finder"
18+
"github.com/theandrew168/bloggulus/backend/job"
1819
"github.com/theandrew168/bloggulus/backend/postgres"
1920
"github.com/theandrew168/bloggulus/backend/repository"
20-
"github.com/theandrew168/bloggulus/backend/service"
2121
"github.com/theandrew168/bloggulus/backend/web"
2222
)
2323

@@ -84,10 +84,10 @@ func run() error {
8484
// Init the sync service and do an initial sync.
8585
feedFetcher := fetch.NewFeedFetcher()
8686
pageFetcher := fetch.NewPageFetcher()
87-
syncService := service.NewSyncService(repo, feedFetcher)
87+
syncService := job.NewSyncService(repo, feedFetcher)
8888

8989
// Init the session service and clear any expired session tokens.
90-
sessionService := service.NewSessionService(repo)
90+
sessionService := job.NewSessionService(repo)
9191

9292
// Let systemd know that we are good to go (no-op if not using systemd).
9393
daemon.SdNotify(false, daemon.SdNotifyReady)

0 commit comments

Comments
 (0)