refactor(common-job): mv cron -> common-job (#575)

sugar-cat7 · Sep 24, 2024 · 2103dc0 · 2103dc0
1 parent 9d648a0
commit 2103dc0
Show file tree

Hide file tree

Showing 133 changed files with 412 additions and 263 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -14,7 +14,7 @@ updates:
   #       update-types: ["version-update:semver-major"]
 
   - package-ecosystem: "gomod"
-    directory: "/service/cron/"
+    directory: "/service/common-job/"
     schedule:
       interval: "weekly"
     ignore:

diff --git a/.github/workflows/ci-go.yaml b/.github/workflows/ci-go.yaml
@@ -5,7 +5,7 @@ on:
       branches:
         - main
       paths:
-        - 'service/cron/**'
+        - 'service/common-job/**'
 
 permissions:
   contents: read
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
         run:
-          working-directory: ./service/cron
+          working-directory: ./service/common-job
 
     steps:
       - uses: actions/checkout@v4
@@ -39,4 +39,4 @@ jobs:
         uses: golangci/golangci-lint-action@v5
         with:
           version: v1.58.0
-          working-directory: ./service/cron
+          working-directory: ./service/common-job
diff --git a/Makefile b/Makefile
@@ -0,0 +1,9 @@
+.PHONY: sqlc
+
+sqlc:
+	@echo "Pulling sqlc/sqlc Docker image..."
+	docker pull sqlc/sqlc
+	@echo "Removing old generated files..."
+	rm -rf ./service/common-job/infra/database/internal/gen
+	@echo "Generating sqlc files..."
+	docker run --rm -v $$(pwd):/src -w /src sqlc/sqlc generate
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Vspo Portal is a repository for providing fan-made services related to Vspo. ([X
 | Service Name                                          | Description                                                                                                | Repository                                |
 | ----------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ----------------------------------------- |
 | [Spodule](https://www.vspo-schedule.com/schedule/all) | A site where you can check the broadcasts (YouTube/Twitch/Twitcasting/Niconico) and clips of Vspo members. | [vspo-schedule](./service/vspo-schedule/) |
-| Common API                                            |                                                                                                            | [vspo-schedule-api](./service/cron/)      |
+| Common API                                            |                                                                                                            | [vspo-schedule-api](./service/common-job/)      |
 
 
 ## Development Roadmap

diff --git a/service/cron/.air.toml → service/common-job/.air.toml b/service/cron/.air.toml → service/common-job/.air.toml
diff --git a/service/cron/.gitignore → service/common-job/.gitignore b/service/cron/.gitignore → service/common-job/.gitignore
diff --git a/service/cron/Dockerfile → service/common-job/Dockerfile b/service/cron/Dockerfile → service/common-job/Dockerfile
diff --git a/service/cron/Makefile → service/common-job/Makefile b/service/cron/Makefile → service/common-job/Makefile
diff --git a/service/cron/README.md → service/common-job/README.md b/service/cron/README.md → service/common-job/README.md
@@ -1,4 +1,4 @@
-## Vspo Cron
+## Vspo Job Service
 
 ### Description
 Youtube/Twitch/Twitcasting live stream update cron service.

diff --git a/service/cron/api/cron/creators/index.go → ...ice/common-job/api/cron/creators/index.go b/service/cron/api/cron/creators/index.go → ...ice/common-job/api/cron/creators/index.go
@@ -3,7 +3,7 @@ package handler
 import (
 	"net/http"
 
-	http_func "github.com/sugar-cat7/vspo-portal/service/cron/infra/http/cron"
+	http_func "github.com/sugar-cat7/vspo-portal/service/common-job/infra/http/cron"
 )
 
 func Handler(w http.ResponseWriter, r *http.Request) {

diff --git a/service/cron/api/cron/videos/index.go → service/common-job/api/cron/videos/index.go b/service/cron/api/cron/videos/index.go → service/common-job/api/cron/videos/index.go
@@ -3,7 +3,7 @@ package handler
 import (
 	"net/http"
 
-	http_func "github.com/sugar-cat7/vspo-portal/service/cron/infra/http/cron"
+	http_func "github.com/sugar-cat7/vspo-portal/service/common-job/infra/http/cron"
 )
 
 func Handler(w http.ResponseWriter, r *http.Request) {

diff --git a/service/cron/api/ping/index.go → service/common-job/api/ping/index.go b/service/cron/api/ping/index.go → service/common-job/api/ping/index.go
@@ -3,7 +3,7 @@ package handler
 import (
 	"net/http"
 
-	http_func "github.com/sugar-cat7/vspo-portal/service/cron/infra/http/cron"
+	http_func "github.com/sugar-cat7/vspo-portal/service/common-job/infra/http/cron"
 )
 
 func Handler(w http.ResponseWriter, r *http.Request) {

diff --git a/service/cron/cmd/index.go → service/common-job/cmd/index.go b/service/cron/cmd/index.go → service/common-job/cmd/index.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/cmd"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/cmd"
 )
 
 func main() {

diff --git a/service/cron/docs/cron/openapi.yaml → service/common-job/docs/cron/openapi.yaml b/service/cron/docs/cron/openapi.yaml → service/common-job/docs/cron/openapi.yaml
diff --git a/service/cron/docs/images/1.png → service/common-job/docs/images/1.png b/service/cron/docs/images/1.png → service/common-job/docs/images/1.png
diff --git a/service/cron/docs/images/2.png → service/common-job/docs/images/2.png b/service/cron/docs/images/2.png → service/common-job/docs/images/2.png
diff --git a/service/cron/domain/model/channel.go → service/common-job/domain/model/channel.go b/service/cron/domain/model/channel.go → service/common-job/domain/model/channel.go
diff --git a/service/cron/domain/model/creator.go → service/common-job/domain/model/creator.go b/service/cron/domain/model/creator.go → service/common-job/domain/model/creator.go
diff --git a/service/cron/domain/model/pagination.go → ...ice/common-job/domain/model/pagination.go b/service/cron/domain/model/pagination.go → ...ice/common-job/domain/model/pagination.go
diff --git a/service/cron/domain/model/period.go → service/common-job/domain/model/period.go b/service/cron/domain/model/period.go → service/common-job/domain/model/period.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	utime "github.com/sugar-cat7/vspo-portal/service/cron/pkg/time"
+	utime "github.com/sugar-cat7/vspo-portal/service/common-job/pkg/time"
 )
 
 type Period string

diff --git a/service/cron/domain/model/platform.go → service/common-job/domain/model/platform.go b/service/cron/domain/model/platform.go → service/common-job/domain/model/platform.go
diff --git a/service/cron/domain/model/thubnail.go → service/common-job/domain/model/thubnail.go b/service/cron/domain/model/thubnail.go → service/common-job/domain/model/thubnail.go
diff --git a/service/cron/domain/model/video.go → service/common-job/domain/model/video.go b/service/cron/domain/model/video.go → service/common-job/domain/model/video.go
diff --git a/service/cron/domain/repository/base.go → service/common-job/domain/repository/base.go b/service/cron/domain/repository/base.go → service/common-job/domain/repository/base.go
diff --git a/service/cron/domain/repository/channel.go → ...e/common-job/domain/repository/channel.go b/service/cron/domain/repository/channel.go → ...e/common-job/domain/repository/channel.go
@@ -3,7 +3,7 @@ package repository
 import (
 	"context"
 
-	"github.com/sugar-cat7/vspo-portal/service/cron/domain/model"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/domain/model"
 )
 
 //go:generate go run go.uber.org/mock/mockgen -source=$GOFILE -destination=mock/$GOFILE -package=mock_repository

diff --git a/service/cron/domain/repository/creator.go → ...e/common-job/domain/repository/creator.go b/service/cron/domain/repository/creator.go → ...e/common-job/domain/repository/creator.go
@@ -3,7 +3,7 @@ package repository
 import (
 	"context"
 
-	"github.com/sugar-cat7/vspo-portal/service/cron/domain/model"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/domain/model"
 )
 
 //go:generate go run go.uber.org/mock/mockgen -source=$GOFILE -destination=mock/$GOFILE -package=mock_repository

diff --git a/...ce/cron/domain/repository/mock/channel.go → ...mon-job/domain/repository/mock/channel.go b/...ce/cron/domain/repository/mock/channel.go → ...mon-job/domain/repository/mock/channel.go
diff --git a/...ce/cron/domain/repository/mock/creator.go → ...mon-job/domain/repository/mock/creator.go b/...ce/cron/domain/repository/mock/creator.go → ...mon-job/domain/repository/mock/creator.go
diff --git a/service/cron/domain/repository/mock/video.go → ...ommon-job/domain/repository/mock/video.go b/service/cron/domain/repository/mock/video.go → ...ommon-job/domain/repository/mock/video.go
diff --git a/...ce/cron/domain/repository/transactable.go → ...mon-job/domain/repository/transactable.go b/...ce/cron/domain/repository/transactable.go → ...mon-job/domain/repository/transactable.go
diff --git a/service/cron/domain/repository/video.go → ...ice/common-job/domain/repository/video.go b/service/cron/domain/repository/video.go → ...ice/common-job/domain/repository/video.go
@@ -3,7 +3,7 @@ package repository
 import (
 	"context"
 
-	"github.com/sugar-cat7/vspo-portal/service/cron/domain/model"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/domain/model"
 )
 
 //go:generate go run go.uber.org/mock/mockgen -source=$GOFILE -destination=mock/$GOFILE -package=mock_repository

diff --git a/...on/domain/twitcasting/mock/twitcasting.go → ...ob/domain/twitcasting/mock/twitcasting.go b/...on/domain/twitcasting/mock/twitcasting.go → ...ob/domain/twitcasting/mock/twitcasting.go
diff --git a/...ce/cron/domain/twitcasting/twitcasting.go → ...mon-job/domain/twitcasting/twitcasting.go b/...ce/cron/domain/twitcasting/twitcasting.go → ...mon-job/domain/twitcasting/twitcasting.go
@@ -3,7 +3,7 @@ package twitcasting
 import (
 	"context"
 
-	"github.com/sugar-cat7/vspo-portal/service/cron/domain/model"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/domain/model"
 )
 
 //go:generate go run go.uber.org/mock/mockgen -source=$GOFILE -destination=mock/$GOFILE -package=mock_twitcasting

diff --git a/service/cron/domain/twitch/mock/twitch.go → ...e/common-job/domain/twitch/mock/twitch.go b/service/cron/domain/twitch/mock/twitch.go → ...e/common-job/domain/twitch/mock/twitch.go
diff --git a/service/cron/domain/twitch/twitch.go → service/common-job/domain/twitch/twitch.go b/service/cron/domain/twitch/twitch.go → service/common-job/domain/twitch/twitch.go
@@ -3,7 +3,7 @@ package twitch
 import (
 	"context"
 
-	"github.com/sugar-cat7/vspo-portal/service/cron/domain/model"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/domain/model"
 )
 
 //go:generate go run go.uber.org/mock/mockgen -source=$GOFILE -destination=mock/$GOFILE -package=mock_twitch

diff --git a/service/cron/domain/youtube/mock/youtube.go → ...common-job/domain/youtube/mock/youtube.go b/service/cron/domain/youtube/mock/youtube.go → ...common-job/domain/youtube/mock/youtube.go
diff --git a/service/cron/domain/youtube/youtube.go → service/common-job/domain/youtube/youtube.go b/service/cron/domain/youtube/youtube.go → service/common-job/domain/youtube/youtube.go
@@ -3,7 +3,7 @@ package youtube
 import (
 	"context"
 
-	"github.com/sugar-cat7/vspo-portal/service/cron/domain/model"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/domain/model"
 )
 
 //go:generate go run go.uber.org/mock/mockgen -source=$GOFILE -destination=mock/$GOFILE -package=mock_youtube

diff --git a/service/cron/go.mod → service/common-job/go.mod b/service/cron/go.mod → service/common-job/go.mod
@@ -1,4 +1,4 @@
-module github.com/sugar-cat7/vspo-portal/service/cron
+module github.com/sugar-cat7/vspo-portal/service/common-job
 
 go 1.22
 

diff --git a/service/cron/go.sum → service/common-job/go.sum b/service/cron/go.sum → service/common-job/go.sum
diff --git a/.../cmd/internal/cron_cmd/channel_cmd/cmd.go → .../cmd/internal/cron_cmd/channel_cmd/cmd.go b/.../cmd/internal/cron_cmd/channel_cmd/cmd.go → .../cmd/internal/cron_cmd/channel_cmd/cmd.go
diff --git a/...e/cron/infra/cmd/internal/cron_cmd/cmd.go → ...on-job/infra/cmd/internal/cron_cmd/cmd.go b/...e/cron/infra/cmd/internal/cron_cmd/cmd.go → ...on-job/infra/cmd/internal/cron_cmd/cmd.go
@@ -2,8 +2,8 @@ package cron_cmd
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/cmd/internal/cron_cmd/channel_cmd"
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/cmd/internal/cron_cmd/video_cmd"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/cmd/internal/cron_cmd/channel_cmd"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/cmd/internal/cron_cmd/video_cmd"
 )
 
 // NewCronCmd is a function to create cron command

diff --git a/...ternal/cron_cmd/video_cmd/clip_cmd/cmd.go → ...ternal/cron_cmd/video_cmd/clip_cmd/cmd.go b/...ternal/cron_cmd/video_cmd/clip_cmd/cmd.go → ...ternal/cron_cmd/video_cmd/clip_cmd/cmd.go
diff --git a/...ra/cmd/internal/cron_cmd/video_cmd/cmd.go → ...ra/cmd/internal/cron_cmd/video_cmd/cmd.go b/...ra/cmd/internal/cron_cmd/video_cmd/cmd.go → ...ra/cmd/internal/cron_cmd/video_cmd/cmd.go
@@ -2,8 +2,8 @@ package video_cmd
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/cmd/internal/cron_cmd/video_cmd/clip_cmd"
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/cmd/internal/cron_cmd/video_cmd/livestream_cmd"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/cmd/internal/cron_cmd/video_cmd/clip_cmd"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/cmd/internal/cron_cmd/video_cmd/livestream_cmd"
 )
 
 // NewVideoCmd is a function to create video command

diff --git a/.../cron_cmd/video_cmd/livestream_cmd/cmd.go → .../cron_cmd/video_cmd/livestream_cmd/cmd.go b/.../cron_cmd/video_cmd/livestream_cmd/cmd.go → .../cron_cmd/video_cmd/livestream_cmd/cmd.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/caarlos0/env/v10"
 	"github.com/spf13/cobra"
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/dependency"
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/environment"
-	"github.com/sugar-cat7/vspo-portal/service/cron/pkg/logger"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/dependency"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/environment"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/pkg/logger"
 )
 
 // NewVideoCmd is a function to create video command

diff --git a/...md/video_cmd/livestream_cmd/livestream.go → ...md/video_cmd/livestream_cmd/livestream.go b/...md/video_cmd/livestream_cmd/livestream.go → ...md/video_cmd/livestream_cmd/livestream.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/spf13/cobra"
-	"github.com/sugar-cat7/vspo-portal/service/cron/usecase"
-	"github.com/sugar-cat7/vspo-portal/service/cron/usecase/input"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/usecase"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/usecase/input"
 )
 
 type CMD struct {

diff --git a/...nfra/cmd/internal/db_migration_cmd/cmd.go → ...nfra/cmd/internal/db_migration_cmd/cmd.go b/...nfra/cmd/internal/db_migration_cmd/cmd.go → ...nfra/cmd/internal/db_migration_cmd/cmd.go
@@ -3,8 +3,8 @@ package db_migration_cmd
 import (
 	"github.com/caarlos0/env/v10"
 	"github.com/spf13/cobra"
-	migration "github.com/sugar-cat7/vspo-portal/service/cron/infra/database/schema"
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/environment"
+	migration "github.com/sugar-cat7/vspo-portal/service/common-job/infra/database/schema"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/environment"
 )
 
 func NewDBMigrationCmd() *cobra.Command {

diff --git a/...e/cron/infra/cmd/internal/http_cmd/cmd.go → ...on-job/infra/cmd/internal/http_cmd/cmd.go b/...e/cron/infra/cmd/internal/http_cmd/cmd.go → ...on-job/infra/cmd/internal/http_cmd/cmd.go
@@ -3,8 +3,8 @@ package http_cmd
 import (
 	"github.com/caarlos0/env/v10"
 	"github.com/spf13/cobra"
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/environment"
-	http_serve "github.com/sugar-cat7/vspo-portal/service/cron/infra/http/cron"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/environment"
+	http_serve "github.com/sugar-cat7/vspo-portal/service/common-job/infra/http/cron"
 )
 
 func NewHttpServeCmd() *cobra.Command {

diff --git a/service/cron/infra/cmd/root.go → service/common-job/infra/cmd/root.go b/service/cron/infra/cmd/root.go → service/common-job/infra/cmd/root.go
@@ -2,10 +2,10 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/cmd/internal/cron_cmd"
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/cmd/internal/db_migration_cmd"
-	"github.com/sugar-cat7/vspo-portal/service/cron/infra/cmd/internal/http_cmd"
-	"github.com/sugar-cat7/vspo-portal/service/cron/pkg/logger"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/cmd/internal/cron_cmd"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/cmd/internal/db_migration_cmd"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/infra/cmd/internal/http_cmd"
+	"github.com/sugar-cat7/vspo-portal/service/common-job/pkg/logger"
 )
 
 // NewCmdRoot is a function to create root command

diff --git a/service/cron/infra/database/client.go → service/common-job/infra/database/client.go b/service/cron/infra/database/client.go → service/common-job/infra/database/client.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/jackc/pgx/v5/pgxpool"
-	db_sqlc "github.com/sugar-cat7/vspo-portal/service/cron/infra/database/internal/gen"
+	db_sqlc "github.com/sugar-cat7/vspo-portal/service/common-job/infra/database/internal/gen"
 )
 
 // ClientKey is the key for the database connection used within the context.