-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #24 from magi-sche-org/develop
bump up dev->main
- Loading branch information
Showing
7 changed files
with
176 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,11 +6,15 @@ import ( | |
| "net" | ||
|
|
||
| "github.com/geekcamp-vol11-team30/backend/config" | ||
| "github.com/geekcamp-vol11-team30/backend/controller" | ||
| "github.com/geekcamp-vol11-team30/backend/db" | ||
| applogger "github.com/geekcamp-vol11-team30/backend/logger" | ||
| "github.com/geekcamp-vol11-team30/backend/util" | ||
| "github.com/geekcamp-vol11-team30/backend/middleware" | ||
| "github.com/geekcamp-vol11-team30/backend/repository" | ||
| "github.com/geekcamp-vol11-team30/backend/router" | ||
| "github.com/geekcamp-vol11-team30/backend/service" | ||
| "github.com/geekcamp-vol11-team30/backend/usecase" | ||
| "github.com/geekcamp-vol11-team30/backend/validator" | ||
| _ "github.com/go-sql-driver/mysql" | ||
| "github.com/labstack/echo/v4" | ||
| "github.com/volatiletech/sqlboiler/v4/boil" | ||
| "go.uber.org/zap" | ||
| ) | ||
|
|
@@ -19,15 +23,12 @@ func main() { | |
| logger, _ := zap.NewProduction() | ||
| defer logger.Sync() | ||
| sugar := logger.Sugar() | ||
|
|
||
| if err := run(context.Background(), logger); err != nil { | ||
| sugar.Fatal(err) | ||
| } | ||
| } | ||
|
|
||
| func run(ctx context.Context, logger *zap.Logger) error { | ||
| logger.Info("magische starting...") | ||
|
|
||
| cfg, err := config.New() | ||
| if err != nil { | ||
| return err | ||
|
|
@@ -39,42 +40,35 @@ func run(ctx context.Context, logger *zap.Logger) error { | |
| boil.SetDB(db) | ||
| boil.DebugMode = cfg.SqlLog | ||
|
|
||
| // ur := repository.NewUserRepository(db) | ||
| // ar := repository.NewAuthRepository(db) | ||
| // er := repository.NewEventRepository(db) | ||
| // oar := repository.NewOauthRepository(db) | ||
| // gs := service.NewGoogleService(cfg, oar, ur) | ||
| // ms := service.NewMicrosoftService(cfg, oar, ur) | ||
| // uv := validator.NewUserValidator() | ||
| // uu := usecase.NewUserUsecase(ur, oar, er, uv, gs, ms) | ||
| // au := usecase.NewAuthUsecase(cfg, logger, ar) | ||
| // eu := usecase.NewEventUsecase(cfg, er) | ||
| // oau := usecase.NewOauthUsecase(cfg, oar, ur, gs, ms, uu) | ||
| ur := repository.NewUserRepository(db) | ||
| ar := repository.NewAuthRepository(db) | ||
| er := repository.NewEventRepository(db) | ||
| oar := repository.NewOauthRepository(db) | ||
| gs := service.NewGoogleService(cfg, oar, ur) | ||
| ms := service.NewMicrosoftService(cfg, oar, ur) | ||
| uv := validator.NewUserValidator() | ||
| uu := usecase.NewUserUsecase(ur, oar, er, uv, gs, ms) | ||
| au := usecase.NewAuthUsecase(cfg, logger, ar) | ||
| eu := usecase.NewEventUsecase(cfg, er) | ||
| oau := usecase.NewOauthUsecase(cfg, oar, ur, gs, ms, uu) | ||
|
|
||
| // em := middleware.NewErrorMiddleware(logger, uu) | ||
| // atm := middleware.NewAccessTimeMiddleware() | ||
| // am := middleware.NewAuthMiddleware(cfg, logger, au, uu) | ||
| em := middleware.NewErrorMiddleware(logger, uu) | ||
| atm := middleware.NewAccessTimeMiddleware() | ||
| am := middleware.NewAuthMiddleware(cfg, logger, au, uu) | ||
|
|
||
| // uc := controller.NewUserController(uu) | ||
| // ac := controller.NewAuthController(cfg, uu, au) | ||
| // ec := controller.NewEventController(eu) | ||
| // oc := controller.NewOauthController(cfg, oau, uu, au) | ||
| uc := controller.NewUserController(uu) | ||
| ac := controller.NewAuthController(cfg, uu, au) | ||
| ec := controller.NewEventController(eu) | ||
| oc := controller.NewOauthController(cfg, oau, uu, au) | ||
|
|
||
| l, err := net.Listen("tcp", fmt.Sprintf(":%d", cfg.Port)) | ||
| if err != nil { | ||
| logger.Fatal("failed to listen port", zap.Error(err)) | ||
| } | ||
|
|
||
| // err = util.SendMail(*cfg, "[email protected]", "konnitiha", "hello") | ||
| // fmt.Println(err) | ||
|
|
||
| // e := router.NewRouter(cfg, logger, em, atm, am, uc, ac, ec, oc) | ||
| e := echo.New() | ||
| // enable log | ||
| e.GET("/health", func(c echo.Context) error { | ||
| return util.JSONResponse(c, 200, "OK") | ||
| }) | ||
| applogger.SetRequestLoggerToEcho(e, logger) | ||
| e := router.NewRouter(cfg, logger, em, atm, am, uc, ac, ec, oc) | ||
| s := NewServer(e, l, logger) | ||
| return s.Run(ctx) | ||
| } | ||