Merge branch 'db-integration' of git://github.com/arnabsen1729/onlinejudge-server into arnabsen1729-db-integration

Few fixes:
- Change dotenv integrations to use shared config
- Don't use panic in production, use log.Fatal instead

Signed-off-by: Dwaipayan Ray <[email protected]>

Author: raydwaipayan

Diff for: docker-compose.yml

@@ -33,3 +33,4 @@ services:
 networks:
   postgres:
     driver: bridge
+    

Diff for: go.mod

@@ -11,4 +11,5 @@ require (
 	github.com/gofiber/jwt/v2 v2.0.1
 	github.com/joho/godotenv v1.3.0
 	github.com/spf13/viper v1.7.1
+	golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9
 )

Diff for: go.sum

@@ -268,6 +268,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee h1:4yd7jl+vXjalO5ztz6Vc1VADv+S/80LGJmyl1ROJ2AI=
 golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 h1:umElSU9WZirRdgu2yFHY0ayQkEnKiOC1TtM3fWXFnoU=
+golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=

Diff for: migrations/1_init.go

@@ -8,12 +8,21 @@ import (
 
 func init() {
 	migrations.MustRegisterTx(func(db migrations.DB) error {
-		fmt.Println("creating table my_table...")
-		_, err := db.Exec(`CREATE TABLE my_table()`)
+		fmt.Println("creating table users...")
+		_, err := db.Exec(`CREATE TABLE users (
+			id serial PRIMARY KEY,
+			first_name varchar(30),
+			last_name varchar(30),
+			email varchar(50) UNIQUE NOT NULL,
+			password varchar NOT NULL,
+			handle varchar(30) UNIQUE NOT NULL,
+			rating integer DEFAULT 1300,
+			createdAt timestamp
+		);`)
 		return err
 	}, func(db migrations.DB) error {
-		fmt.Println("dropping table my_table...")
-		_, err := db.Exec(`DROP TABLE my_table`)
+		fmt.Println("dropping table users...")
+		_, err := db.Exec(`DROP TABLE users`)
 		return err
 	})
 }

Diff for: server/handler/user_handler.go

@@ -6,21 +6,23 @@ import (
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/gofiber/fiber/v2"
 	"github.com/raydwaipayan/onlinejudge-server/config"
+	"github.com/raydwaipayan/onlinejudge-server/server/models"
 	"github.com/raydwaipayan/onlinejudge-server/server/types"
 )
 
-//Register types.User registration handler
+// Register types.User registration handler
 func Register(c *fiber.Ctx) error {
 	u := new(types.User)
 
 	if err := c.BodyParser(u); err != nil {
 		return c.SendStatus(fiber.StatusBadRequest)
 	}
-
+	u.Create(models.DBConfigURL)
 	return c.SendStatus(fiber.StatusOK)
 }
 
-//Login types.User login handler
+// Login types.User login handler
+// Use closures to handle parameters
 func Login(conf *config.Config) fiber.Handler {
 	return func(c *fiber.Ctx) error {
 		u := new(types.User)

Diff for: server/models/models.go

@@ -0,0 +1,30 @@
+package models
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	pg "github.com/go-pg/pg/v10"
+	"github.com/raydwaipayan/onlinejudge-server/config"
+)
+
+// DBConfigURL  config url of database
+var DBConfigURL *pg.DB
+
+// InitDb to initialise database
+func InitDb(conf *config.Config) {
+	DBConfigURL = pg.Connect(&pg.Options{
+		Addr:     fmt.Sprintf(":%s", conf.DbPort),
+		User:     conf.DbUser,
+		Password: conf.DbPass,
+		Database: conf.DbName,
+	})
+
+	//Check if the database is running
+	ctx := context.Background()
+
+	if err := DBConfigURL.Ping(ctx); err != nil {
+		log.Fatal(err)
+	}
+}

Diff for: server/router/routes.go

@@ -10,7 +10,7 @@ import (
 	handler "github.com/raydwaipayan/onlinejudge-server/server/handler"
 )
 
-//SetupRoutes initiates the fiber router
+// SetupRoutes initiates the fiber router
 func SetupRoutes(app *fiber.App, conf *config.Config) {
 	user := app.Group("/user", logger.New(), limiter.New())
 	user.Post("/register", handler.Register)

Diff for: server/server.go

@@ -1,19 +1,27 @@
 package main
 
 import (
+	"fmt"
+	"log"
+
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/logger"
 	"github.com/gofiber/fiber/v2/middleware/recover"
-	config "github.com/raydwaipayan/onlinejudge-server/config"
+	"github.com/raydwaipayan/onlinejudge-server/config"
+	"github.com/raydwaipayan/onlinejudge-server/server/models"
 	router "github.com/raydwaipayan/onlinejudge-server/server/router"
 )
 
 func main() {
 	app := fiber.New()
-	conf, _ := config.Read()
+	conf, err := config.Read()
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	app.Use(recover.New(), logger.New())
 
 	router.SetupRoutes(app, conf)
-	app.Listen(":3000")
+	models.InitDb(conf)
+	app.Listen(fmt.Sprintf(":%s", conf.Port))
 }

Diff for: server/types/db.go

@@ -0,0 +1,43 @@
+package types
+
+import (
+	"log"
+
+	pg "github.com/go-pg/pg/v10"
+	"golang.org/x/crypto/bcrypt"
+)
+
+// Create create a new user and insert into db
+func (u *User) Create(db *pg.DB) error {
+	_, err := db.Model(u).Insert()
+	return err
+}
+
+// Update update existing user
+func (u *User) Update(db *pg.DB) error {
+	_, err := db.Model(u).Update()
+	return err
+}
+
+// CheckUserExists to check if user is present
+func (u *User) CheckUserExists(db *pg.DB) (bool, error) {
+	user := new(User)
+	err := db.Model(user).Table("users").Where("users.email = ?", u.Email).Limit(1).Select()
+	encryptionErr := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(u.Password))
+
+	if encryptionErr == nil {
+		u.FirstName = user.FirstName
+		u.LastName = user.LastName
+		return true, nil
+	}
+	if err != nil {
+		log.Println(err)
+	}
+	return false, err
+}
+
+//Delete delete user
+func (u *User) Delete(db *pg.DB) error {
+	_, err := db.Model(u).Delete()
+	return err
+}