Merge pull request #19 from Sharath-a26/main

Used a shared logger

Author: Ashrockzzz2003

.gitignore

@@ -23,3 +23,6 @@ go.work.sum
 
 # env file
 .env
+
+# log files
+*.log

controller/login.go

@@ -8,8 +8,9 @@ import (
 )
 
 func Login(res http.ResponseWriter, req *http.Request) {
-	var logger = util.NewLogger()
-	logger.Info("Login API called.")
+
+	logger := util.SharedLogger
+	logger.InfoCtx(req, "Login API called.")
 
 	data, err := util.Body(req)
 	if err != nil {

controller/register.go

@@ -9,8 +9,9 @@ import (
 )
 
 func Register(res http.ResponseWriter, req *http.Request) {
-	var logger = util.NewLogger()
-	logger.Info("Register API called.")
+
+	logger := util.SharedLogger
+	logger.InfoCtx(req, "Register API called.")
 
 	data, err := util.Body(req)
 	if err != nil {
@@ -44,8 +45,10 @@ func Register(res http.ResponseWriter, req *http.Request) {
 }
 
 func Verify(res http.ResponseWriter, req *http.Request) {
-	var logger = util.NewLogger()
-	logger.Info("Verify API called.")
+	// var logger = util.NewLogger()
+
+	logger := util.SharedLogger
+	logger.InfoCtx(req, "Verify API called.")
 
 	token, err := req.Cookie("t")
 	if err != nil {

controller/test.go

@@ -6,10 +6,11 @@ import (
 )
 
 func Test(res http.ResponseWriter, req *http.Request) {
-	var logger = util.NewLogger()
+
+	logger := util.SharedLogger
 	switch req.Method {
 	case "GET":
-		logger.Info("GET /api/test called.")
+		logger.InfoCtx(req, "GET /api/test called.")
 		util.JSONResponse(res, http.StatusOK, "It works! 👍🏻", nil)
 	default:
 		util.JSONResponse(res, http.StatusMethodNotAllowed, "Method not allowed", nil)

db/init.go

@@ -8,22 +8,23 @@ import (
 )
 
 func InitDb(ctx context.Context) error {
-	var logger = util.NewLogger()
+
+	logger := util.SharedLogger
 	conn, err := connection.PoolConn(ctx)
 	if err != nil {
-		logger.Error("initDb: failed to get pool connection")
+		logger.Error("initDb: failed to get pool connection", err)
 		return err
 	}
 
 	sql, err := os.ReadFile("db/scripts/init.sql")
 	if err != nil {
-		logger.Error("initDb: failed to read init.sql")
+		logger.Error("initDb: failed to read init.sql", err)
 		return err
 	}
 
 	_, err = conn.Exec(ctx, string(sql))
 	if err != nil {
-		logger.Error("initDb: failed to execute init.sql")
+		logger.Error("initDb: failed to execute init.sql", err)
 		return err
 	}
 

db/scripts/init.sql

@@ -1,7 +1,10 @@
+DROP TABLE IF EXISTS teamMembers;
+DROP TABLE IF EXISTS team;
 DROP TABLE IF EXISTS access;
 DROP TABLE IF EXISTS run;
 DROP TABLE IF EXISTS registerOtp;
 DROP TABLE IF EXISTS users;
+ 
 CREATE TABLE IF NOT EXISTS users (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
     userName STRING UNIQUE NOT NULL,
@@ -41,4 +44,22 @@ CREATE TABLE IF NOT EXISTS access (
     PRIMARY KEY (runID, userID),
     createdAt TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
     updatedAt TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL
+);
+
+--table to maintain team metadata
+CREATE TABLE IF NOT EXISTS team (
+    teamID UUID PRIMARY KEY,
+    createdBy STRING NOT NULL,
+    role STRING,
+    createdAt TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
+    updatedAt TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL
+);
+
+--table to maintain team members associated to that team
+CREATE TABLE IF NOT EXISTS teamMembers (
+    memberId UUID REFERENCES users(id),
+    teamID UUID REFERENCES team(teamID),
+    PRIMARY KEY (memberId, teamID),
+    createdAt TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL,
+    updatedAt TIMESTAMP WITH TIME ZONE DEFAULT now() NOT NULL
 );

go.mod

@@ -18,6 +18,9 @@ require (
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/rs/zerolog v1.34.0 // indirect
 	github.com/stretchr/testify v1.10.0 // indirect
 	golang.org/x/crypto v0.35.0 // indirect
 	golang.org/x/net v0.32.0 // indirect

go.sum

@@ -2,13 +2,15 @@ aidanwoods.dev/go-paseto v1.5.4 h1:MH+SBroZEk5Q5pjhVh4l48HIbrdWhWI3SZmA/DXhnuw=
 aidanwoods.dev/go-paseto v1.5.4/go.mod h1:Rn37AIcqrvSMu0YPw65CrlEUuoyKL6Yw6B0htrGr3EU=
 aidanwoods.dev/go-result v0.3.1 h1:ee98hpohYUVYbI+pa6gUHTyoRerIudgjky/IPSowDXQ=
 aidanwoods.dev/go-result v0.3.1/go.mod h1:GKnFg8p/BKulVD3wsfULiPhpPmrTWyiTIbz8EWuUqSk=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -23,10 +25,19 @@ github.com/jackc/pgx/v5 v5.7.2 h1:mLoDLV6sonKlvjIEsV56SkWNCnuNv531l94GaIzO+XI=
 github.com/jackc/pgx/v5 v5.7.2/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
 github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
 github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
+github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
+github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -48,6 +59,9 @@ golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
 golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
 golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
 golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"aidanwoods.dev/go-paseto"
 	"context"
 	"evolve/config"
 	"evolve/controller"
@@ -10,53 +11,55 @@ import (
 	"evolve/routes"
 	"evolve/util"
 	"fmt"
+	"github.com/rs/cors"
+	"google.golang.org/grpc"
 	"net"
 	"net/http"
 	"os"
 	"runtime"
-
-	"aidanwoods.dev/go-paseto"
-	"github.com/rs/cors"
-	"google.golang.org/grpc"
 )
 
 var (
 	HTTP_PORT string
 	GRPC_PORT string
 )
 
-func serveHTTP(logger *util.Logger) {
+func serveHTTP(logger *util.LoggerService) {
 	// Register routes.
 	http.HandleFunc(routes.TEST, controller.Test)
 	http.HandleFunc(routes.REGISTER, controller.Register)
 	http.HandleFunc(routes.VERIFY, controller.Verify)
 	http.HandleFunc(routes.LOGIN, controller.Login)
 
+	
 	logger.Info(fmt.Sprintf("Test http server on http://localhost%v/api/test", HTTP_PORT))
 	corsHandler := cors.New(cors.Options{
 		AllowedOrigins:   []string{os.Getenv("FRONTEND_URL")}, // Allowing frontend to access the server.
 		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowedHeaders:   []string{"*"},
 		AllowCredentials: true,
 	}).Handler(http.DefaultServeMux)
-	if err := http.ListenAndServe(HTTP_PORT, corsHandler); err != nil {
-		logger.Error(fmt.Sprintf("Failed to start server: %v", err))
+
+	handler := util.Log.LogMiddleware(corsHandler)
+
+	if err := http.ListenAndServe(HTTP_PORT, handler); err != nil {
+		logger.Error(fmt.Sprintf("Failed to start server: %v", err), err)
 		return
 	}
 }
 
-func serveGRPC(logger *util.Logger) {
+func serveGRPC(logger *util.LoggerService) {
 	lis, err := net.Listen("tcp", GRPC_PORT)
 	if err != nil {
-		logger.Error(fmt.Sprintf("failed to listen TCP in GRPC PORT%v : %v", GRPC_PORT, err))
+		logger.Error(fmt.Sprintf("failed to listen TCP in GRPC PORT%v : %v", GRPC_PORT, err), err)
 		return
 	}
 
 	s := grpc.NewServer()
 	pb.RegisterAuthenticateServer(s, &grpcserver.GRPCServer{})
 	logger.Info(fmt.Sprintf("Test grpc server on http://localhost%v", GRPC_PORT))
 	if err := s.Serve(lis); err != nil {
-		logger.Error(fmt.Sprintf("failed to serve: %v", err))
+		logger.Error(fmt.Sprintf("failed to serve: %v", err), err)
 		return
 	}
 }
@@ -65,22 +68,29 @@ func main() {
 
 	HTTP_PORT = fmt.Sprintf(":%v", os.Getenv("HTTP_PORT"))
 	GRPC_PORT = fmt.Sprintf(":%v", os.Getenv("GRPC_PORT"))
+	
+	logger, err := util.InitLogger(os.Getenv("ENV")) // "DEVELOPMENT" or "PRODUCTION"
+	if err != nil {
+		fmt.Println("failed to init logger:", err)
+		return
+	}
+	util.Log = logger
 
-	var logger = util.NewLogger()
+	
 
 	// Initialize db with schema.
 	if err := db.InitDb(context.Background()); err != nil {
-		logger.Error("failed to init db")
-		logger.Error(err.Error())
+		logger.Error("failed to init db", err)
+		logger.Error(err.Error(), err)
 		return
 	}
 
 	// Initialize key.
 	key := paseto.NewV4AsymmetricSecretKey()
 	config.PrivateKey, config.PublicKey = key, key.Public()
 
-	go serveHTTP(logger)
-	go serveGRPC(logger)
+	go serveHTTP(util.Log)
+	go serveGRPC(util.Log)
 
 	runtime.Goexit()
 }

modules/login.go

@@ -46,15 +46,15 @@ func (l *LoginReq) validate() error {
 }
 
 func (l *LoginReq) Login(ctx context.Context) (map[string]string, error) {
-	var logger = util.NewLogger()
 
+	logger := util.SharedLogger
 	if err := l.validate(); err != nil {
 		return nil, err
 	}
 
 	db, err := connection.PoolConn(ctx)
 	if err != nil {
-		logger.Error(fmt.Sprintf("Login: failed to get pool connection: %v", err))
+		logger.Error(fmt.Sprintf("Login: failed to get pool connection: %v", err), err)
 		return nil, fmt.Errorf("something went wrong")
 	}
 
@@ -64,13 +64,13 @@ func (l *LoginReq) Login(ctx context.Context) (map[string]string, error) {
 
 	err = db.QueryRow(ctx, "SELECT id, role FROM users WHERE (username = $1 OR email = $2) AND password = $3", l.UserName, l.Email, l.Password).Scan(&id, &role)
 	if err != nil {
-		logger.Error(fmt.Sprintf("Login: failed to query user: %v", err))
+		logger.Error(fmt.Sprintf("Login: failed to query user: %v", err), err)
 		return nil, fmt.Errorf("invalid username/email or password")
 	}
 
 	user, err := dbutil.UserById(ctx, id.String(), db)
 	if err != nil {
-		logger.Error(fmt.Sprintf("Login: failed to get user by id: %v", err))
+		logger.Error(fmt.Sprintf("Login: failed to get user by id: %v", err), err)
 		return nil, fmt.Errorf("user not found")
 	}
 
@@ -81,7 +81,7 @@ func (l *LoginReq) Login(ctx context.Context) (map[string]string, error) {
 		"purpose": "login",
 	})
 	if err != nil {
-		logger.Error(fmt.Sprintf("Login: failed to generate token: %v", err))
+		logger.Error(fmt.Sprintf("Login: failed to generate token: %v", err), err)
 		return nil, fmt.Errorf("something went wrong")
 	}