diff --git a/api/memo.go b/api/memo.go index 3b2495ee..c86323d7 100644 --- a/api/memo.go +++ b/api/memo.go @@ -11,8 +11,9 @@ type Memo struct { } type MemoCreate struct { - Content string `json:"content"` CreatorId int + + Content string `json:"content"` } type MemoPatch struct { @@ -29,8 +30,7 @@ type MemoFind struct { } type MemoDelete struct { - Id *int `json:"id"` - CreatorId *int + Id *int `json:"id"` } type MemoService interface { diff --git a/bin/server/cmd/profile.go b/bin/server/cmd/profile.go index b176bb0c..5b3dd122 100644 --- a/bin/server/cmd/profile.go +++ b/bin/server/cmd/profile.go @@ -1,10 +1,10 @@ package cmd import ( - "flag" "fmt" "os" "path/filepath" + "strconv" "strings" ) @@ -40,22 +40,29 @@ func checkDSN(dataDir string) (string, error) { // GetDevProfile will return a profile for dev. func GetProfile() Profile { - mode := flag.String("mode", "dev", "") - port := flag.Int("port", 8080, "") - data := flag.String("data", "", "") - flag.Parse() + mode := os.Getenv("mode") + if mode != "dev" && mode != "release" { + mode = "dev" + } - dataDir, err := checkDSN(*data) + port, err := strconv.Atoi(os.Getenv("port")) + if err != nil { + port = 8080 + } + + data := os.Getenv("data") + + dataDir, err := checkDSN(data) if err != nil { fmt.Printf("Failed to check dsn: %s, err: %+v\n", dataDir, err) os.Exit(1) } - dsn := fmt.Sprintf("file:%s/memos_%s.db", dataDir, *mode) + dsn := fmt.Sprintf("file:%s/memos_%s.db", dataDir, mode) return Profile{ - mode: *mode, - port: *port, + mode: mode, + port: port, dsn: dsn, } } diff --git a/server/auth.go b/server/auth.go index 6c5dad16..466779be 100644 --- a/server/auth.go +++ b/server/auth.go @@ -47,6 +47,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) { return nil }) + g.POST("/auth/logout", func(c echo.Context) error { err := removeUserSession(c) if err != nil { @@ -56,6 +57,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) { c.Response().WriteHeader(http.StatusOK) return nil }) + g.POST("/auth/signup", func(c echo.Context) error { signup := &api.Signup{} if err := json.NewDecoder(c.Request().Body).Decode(signup); err != nil { diff --git a/server/memo.go b/server/memo.go index 0f18e384..b8d33aee 100644 --- a/server/memo.go +++ b/server/memo.go @@ -33,6 +33,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { return nil }) + g.PATCH("/memo/:memoId", func(c echo.Context) error { memoId, err := strconv.Atoi(c.Param("memoId")) if err != nil { @@ -58,6 +59,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { return nil }) + g.GET("/memo", func(c echo.Context) error { userId := c.Get(getUserIdContextKey()).(int) memoFind := &api.MemoFind{ @@ -86,6 +88,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { return nil }) + g.GET("/memo/:memoId", func(c echo.Context) error { memoId, err := strconv.Atoi(c.Param("memoId")) if err != nil { @@ -111,6 +114,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { return nil }) + g.DELETE("/memo/:memoId", func(c echo.Context) error { memoId, err := strconv.Atoi(c.Param("memoId")) if err != nil { diff --git a/server/resource.go b/server/resource.go index 3672c42a..36fea469 100644 --- a/server/resource.go +++ b/server/resource.go @@ -59,6 +59,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) { return nil }) + g.GET("/resource", func(c echo.Context) error { userId := c.Get(getUserIdContextKey()).(int) resourceFind := &api.ResourceFind{ @@ -76,6 +77,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) { return nil }) + g.DELETE("/resource/:resourceId", func(c echo.Context) error { resourceId, err := strconv.Atoi(c.Param("resourceId")) if err != nil { diff --git a/server/shortcut.go b/server/shortcut.go index 27bfe16b..d7c21f6b 100644 --- a/server/shortcut.go +++ b/server/shortcut.go @@ -32,6 +32,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) { return nil }) + g.PATCH("/shortcut/:shortcutId", func(c echo.Context) error { shortcutId, err := strconv.Atoi(c.Param("shortcutId")) if err != nil { @@ -57,6 +58,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) { return nil }) + g.GET("/shortcut", func(c echo.Context) error { userId := c.Get(getUserIdContextKey()).(int) shortcutFind := &api.ShortcutFind{ @@ -74,6 +76,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) { return nil }) + g.GET("/shortcut/:shortcutId", func(c echo.Context) error { shortcutId, err := strconv.Atoi(c.Param("shortcutId")) if err != nil { @@ -95,6 +98,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) { return nil }) + g.DELETE("/shortcut/:shortcutId", func(c echo.Context) error { shortcutId, err := strconv.Atoi(c.Param("shortcutId")) if err != nil { diff --git a/server/user.go b/server/user.go index db57dfe4..d57b34f1 100644 --- a/server/user.go +++ b/server/user.go @@ -34,6 +34,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) { return nil }) + g.POST("/user/rename_check", func(c echo.Context) error { userRenameCheck := &api.UserRenameCheck{} if err := json.NewDecoder(c.Request().Body).Decode(userRenameCheck); err != nil { @@ -64,6 +65,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) { return nil }) + g.POST("/user/password_check", func(c echo.Context) error { userId := c.Get(getUserIdContextKey()).(int) userPasswordCheck := &api.UserPasswordCheck{} @@ -96,6 +98,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) { return nil }) + g.PATCH("/user/me", func(c echo.Context) error { userId := c.Get(getUserIdContextKey()).(int) userPatch := &api.UserPatch{ diff --git a/server/webhook.go b/server/webhook.go index 5318668f..72504385 100644 --- a/server/webhook.go +++ b/server/webhook.go @@ -14,6 +14,7 @@ func (s *Server) registerWebhookRoutes(g *echo.Group) { g.GET("/test", func(c echo.Context) error { return c.HTML(http.StatusOK, "Hello, World!") }) + g.POST("/:openId/memo", func(c echo.Context) error { openId := c.Param("openId") @@ -47,6 +48,7 @@ func (s *Server) registerWebhookRoutes(g *echo.Group) { return nil }) + g.GET("/:openId/memo", func(c echo.Context) error { openId := c.Param("openId")