Merge branch 'feature/monolith' into feature/staging

Author: hayato24s

.env.example

@@ -1,18 +1,22 @@
+# auth
+SESSION_LIFE_TIME_DAYS=90
+
+# timetable
+COURSE_CACHE_HOURS=3
+
+# donation
+STRIPE_KEY=***
+STRIPE_CHECKOUT_SUCCESS_URL=http://localhost:8080
+STRIPE_CHECKOUT_CANCEL_URL=http://localhost:8080
+
 # db
 DB_URL=postgres://postgres:password@db:5432/twinte_db?sslmode=disable
 TEST_DB_URL=postgres://postgres:password@db:5432/twinte_db_test?sslmode=disable
 
-# cookie
-COOKIE_SECURE=false
-COOKIE_SESSION_NAME=twinte_session
-COOKIE_OAUTH2_STATE_NAME=twinte_oauth2_state
-COOKIE_OAUTH2_STATE_MAX_AGE=180
-
-# auth
+# handler
+ADDR=:8080
 AUTH_REDIRECT_URL=http://localhost:3000
-SESSION_LIFE_TIME_DAYS=90
 
-# oauth2
 OAUTH2_GOOGLE_CLIENT_ID=***
 OAUTH2_GOOGLE_CLIENT_SECRET=***
 OAUTH2_GOOGLE_CALLBACK_URL=http://localhost:8080/google/callback
@@ -23,5 +27,7 @@ OAUTH2_APPLE_CLIENT_ID=***
 OAUTH2_APPLE_CLIENT_SECRET=***
 OAUTH2_APPLE_CALLBACK_URL=http://localhost:8080/apple/callback
 
-# timetable
-COURSE_CACHE_HOURS=3
+COOKIE_SECURE=false
+COOKIE_SESSION_NAME=twinte_session
+COOKIE_OAUTH2_STATE_NAME=twinte_oauth2_state
+COOKIE_OAUTH2_STATE_MAX_AGE=180

Makefile

@@ -28,7 +28,7 @@ migrate-create:
 
 # e.g. make migrate-up db_url=${DB_URL}
 migrate-up:
-	migrate -database ${db_url} -path ./db/migrations up;
+	migrate -database ${db_url} -path ./db/migrations up
 
 # e.g. make migrate-down db_url=${DB_URL}
 migrate-down:

appenv/appenv.go

@@ -0,0 +1,31 @@
+package appenv
+
+import (
+	"fmt"
+	"os"
+	"strconv"
+)
+
+func loadBool(key string) bool {
+	ret, err := strconv.ParseBool(os.Getenv(key))
+	if err != nil {
+		panic(fmt.Errorf("failed to load environment variable (%s) due to %w", key, err))
+	}
+	return ret
+}
+
+func loadInt(key string) int {
+	ret, err := strconv.Atoi(os.Getenv(key))
+	if err != nil {
+		panic(fmt.Errorf("failed to load environment variable (%s) due to %w", key, err))
+	}
+	return ret
+}
+
+func loadString(key string) string {
+	ret := os.Getenv(key)
+	if ret == "" {
+		panic(fmt.Errorf("failed to load environment variable (%s), please set it", key))
+	}
+	return ret
+}

appenv/loader.go

@@ -0,0 +1,37 @@
+package appenv
+
+var (
+	// auth
+	SESSION_LIFE_TIME_DAYS int = loadInt("SESSION_LIFE_TIME_DAYS")
+
+	// timetable
+	COURSE_CACHE_HOURS int = loadInt("COURSE_CACHE_HOURS")
+
+	// donation
+	STRIPE_KEY                  string = loadString("STRIPE_KEY")
+	STRIPE_CHECKOUT_SUCCESS_URL string = loadString("STRIPE_CHECKOUT_SUCCESS_URL")
+	STRIPE_CHECKOUT_CANCEL_URL  string = loadString("STRIPE_CHECKOUT_CANCEL_URL")
+
+	// db
+	DB_URL      string = loadString("DB_URL")
+	TEST_DB_URL string = loadString("TEST_DB_URL")
+
+	// handler
+	ADDR              string = loadString("ADDR")
+	AUTH_REDIRECT_URL string = loadString("AUTH_REDIRECT_URL")
+
+	OAUTH2_GOOGLE_CLIENT_ID      string = loadString("OAUTH2_GOOGLE_CLIENT_ID")
+	OAUTH2_GOOGLE_CLIENT_SECRET  string = loadString("OAUTH2_GOOGLE_CLIENT_SECRET")
+	OAUTH2_GOOGLE_CALLBACK_URL   string = loadString("OAUTH2_GOOGLE_CALLBACK_URL")
+	OAUTH2_TWITTER_CLIENT_ID     string = loadString("OAUTH2_TWITTER_CLIENT_ID")
+	OAUTH2_TWITTER_CLIENT_SECRET string = loadString("OAUTH2_TWITTER_CLIENT_SECRET")
+	OAUTH2_TWITTER_CALLBACK_URL  string = loadString("OAUTH2_TWITTER_CALLBACK_URL")
+	OAUTH2_APPLE_CLIENT_ID       string = loadString("OAUTH2_APPLE_CLIENT_ID")
+	OAUTH2_APPLE_CLIENT_SECRET   string = loadString("OAUTH2_APPLE_CLIENT_SECRET")
+	OAUTH2_APPLE_CALLBACK_URL    string = loadString("OAUTH2_APPLE_CALLBACK_URL")
+
+	COOKIE_SECURE               bool   = loadBool("COOKIE_SECURE")
+	COOKIE_SESSION_NAME         string = loadString("COOKIE_SESSION_NAME")
+	COOKIE_OAUTH2_STATE_NAME    string = loadString("COOKIE_OAUTH2_STATE_NAME")
+	COOKIE_OAUTH2_STATE_MAX_AGE int    = loadInt("COOKIE_OAUTH2_STATE_MAX_AGE")
+)

appenv/variable.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"log"
 	"net/http"
 	"time"
@@ -46,6 +47,15 @@ var serveCmd = &cobra.Command{
 		announcementRepository := announcementrepository.New(db)
 		announcementUsecase := announcementusecase.New(accessController, announcementFactory, announcementRepository)
 
+		announcements, err := announcementrepository.LoadAnnouncements()
+		if err != nil {
+			log.Fatalln(err)
+		}
+		err = announcementRepository.CreateAnnouncements(context.Background(), announcements...)
+		if err != nil {
+			log.Fatalln(err)
+		}
+
 		var dummyDonationUseCase donationmodule.UseCase
 		// donationFactory := donationfactory.New()
 		// donationGateway := donationgateway.New()
@@ -55,6 +65,24 @@ var serveCmd = &cobra.Command{
 		schoolcalendarRepository := schoolcalendarrepository.New()
 		schoolcalendarUseCase := schoolcalendarusecase.New(accessController, schoolcalendarRepository)
 
+		events, err := schoolcalendarrepository.LoadEvents()
+		if err != nil {
+			log.Fatalln(err)
+		}
+		err = schoolcalendarRepository.CreateEvents(context.Background(), events...)
+		if err != nil {
+			log.Fatalln(err)
+		}
+
+		moduleDetails, err := schoolcalendarrepository.LoadModuleDetails()
+		if err != nil {
+			log.Fatalln(err)
+		}
+		err = schoolcalendarRepository.CreateModuleDetails(context.Background(), moduleDetails...)
+		if err != nil {
+			log.Fatalln(err)
+		}
+
 		timetableFactory := timetablefactory.New(db)
 		timetableGateWay := timetablegateway.New("")
 		timetableRepository := timetablerepository.New(db)

cmd/serve.go

@@ -23,7 +23,7 @@ go run . serve
 ## Migration Tool
 [golang-migrate](https://github.com/golang-migrate/migrate)というツールを使用しています。
 
-Makefileで定義している主なコマンドは次の通りです。詳しくは`migrate --help`からご確認下さい。
+Makefileで定義している主なコマンドは次の通りです。詳しくは`Makefile`や`migrate --help`からご確認下さい。
 ```sh
 # Apply all up migrations
 make migrate-up db_url=${DB_URL}
@@ -51,3 +51,12 @@ go install -tags 'postgres' github.com/golang-migrate/migrate/v4/cmd/migrate@lat
 curl -L https://github.com/golang-migrate/migrate/releases/download/v4.15.2/migrate.linux-arm64.tar.gz | tar xvz
 mv ./migrate /usr/local/bin/
 ```
+
+## Environment Variables
+下記のコマンドを実行することで`.env`ファイルに定義されている環境変数を設定することができます。
+
+```sh
+export $(grep -v '^#' .env | xargs)
+```
+
+c.f. [Stack Overflow](https://stackoverflow.com/questions/19331497/set-environment-variables-from-file-of-key-value-pairs)

docs/README.md

@@ -3,9 +3,10 @@ module github.com/twin-te/twinte-back
 go 1.21
 
 require (
-	cloud.google.com/go v0.112.0
+	cloud.google.com/go v0.112.1
 	github.com/bufbuild/connect-go v1.10.0
 	github.com/getkin/kin-openapi v0.123.0
+	github.com/golang-jwt/jwt/v5 v5.2.0
 	github.com/google/uuid v1.6.0
 	github.com/labstack/echo/v4 v4.11.4
 	github.com/oapi-codegen/runtime v1.1.1
@@ -16,20 +17,31 @@ require (
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
 	golang.org/x/oauth2 v0.17.0
 	golang.org/x/sync v0.6.0
+	google.golang.org/api v0.167.0
 	google.golang.org/protobuf v1.32.0
 	gorm.io/driver/postgres v1.5.6
 	gorm.io/gen v0.3.25
 	gorm.io/gorm v1.25.7
-	gorm.io/plugin/dbresolver v1.5.0
+	gorm.io/plugin/dbresolver v1.5.1
 )
 
 require (
+	cloud.google.com/go/compute v1.24.0 // indirect
+	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.8 // indirect
 	github.com/go-sql-driver/mysql v1.7.0 // indirect
+	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/s2a-go v0.1.7 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
+	github.com/googleapis/gax-go/v2 v2.12.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/invopop/yaml v0.2.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -48,13 +60,21 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
+	go.opentelemetry.io/otel v1.23.0 // indirect
+	go.opentelemetry.io/otel/metric v1.23.0 // indirect
+	go.opentelemetry.io/otel/trace v1.23.0 // indirect
 	golang.org/x/crypto v0.19.0 // indirect
 	golang.org/x/mod v0.15.0 // indirect
 	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.18.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
+	google.golang.org/grpc v1.61.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/datatypes v1.1.1-0.20230130040222-c43177d3cf8c // indirect
 	gorm.io/driver/mysql v1.5.2 // indirect