updated

Author: wpcodevo

controllers/auth.controller.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/wpcodevo/golang-mongodb/config"
@@ -151,6 +152,23 @@ func (ac *AuthController) GoogleOAuth(ctx *gin.Context) {
 		ctx.JSON(http.StatusBadGateway, gin.H{"status": "fail", "message": err.Error()})
 	}
 
+	createdAt := time.Now()
+	resBody := &models.UpdateDBUser{
+		Email:     user.Email,
+		Name:      user.Name,
+		Photo:     user.Picture,
+		Provider:  "google",
+		Role:      "user",
+		Verified:  true,
+		CreatedAt: createdAt,
+		UpdatedAt: createdAt,
+	}
+
+	_, err = ac.userService.UpsertUser(user.Email, resBody)
+	if err != nil {
+		ctx.JSON(http.StatusBadGateway, gin.H{"status": "fail", "message": err.Error()})
+	}
+
 	fmt.Println(user.Email)
 
 	config, _ := config.LoadConfig(".")

models/user.model.go

@@ -12,7 +12,8 @@ type SignUpInput struct {
 	Password        string    `json:"password" bson:"password" binding:"required,min=8"`
 	PasswordConfirm string    `json:"passwordConfirm" bson:"passwordConfirm,omitempty" binding:"required"`
 	Role            string    `json:"role" bson:"role"`
-	Provider        string    `json:"provider" bson:"provider"`
+	Provider        string    `json:"provider,omitempty" bson:"provider,omitempty"`
+	Photo           string    `json:"photo,omitempty" bson:"photo,omitempty"`
 	Verified        bool      `json:"verified" bson:"verified"`
 	CreatedAt       time.Time `json:"created_at" bson:"created_at"`
 	UpdatedAt       time.Time `json:"updated_at" bson:"updated_at"`
@@ -30,6 +31,7 @@ type DBResponse struct {
 	Password        string             `json:"password" bson:"password"`
 	PasswordConfirm string             `json:"passwordConfirm,omitempty" bson:"passwordConfirm,omitempty"`
 	Provider        string             `json:"provider" bson:"provider"`
+	Photo           string             `json:"photo,omitempty" bson:"photo,omitempty"`
 	Role            string             `json:"role" bson:"role"`
 	Verified        bool               `json:"verified" bson:"verified"`
 	CreatedAt       time.Time          `json:"created_at" bson:"created_at"`
@@ -41,6 +43,7 @@ type UserResponse struct {
 	Name      string             `json:"name,omitempty" bson:"name,omitempty"`
 	Email     string             `json:"email,omitempty" bson:"email,omitempty"`
 	Role      string             `json:"role,omitempty" bson:"role,omitempty"`
+	Photo     string             `json:"photo,omitempty" bson:"photo,omitempty"`
 	Provider  string             `json:"provider" bson:"provider"`
 	CreatedAt time.Time          `json:"created_at" bson:"created_at"`
 	UpdatedAt time.Time          `json:"updated_at" bson:"updated_at"`
@@ -54,6 +57,7 @@ type UpdateDBUser struct {
 	PasswordConfirm string             `json:"passwordConfirm,omitempty" bson:"passwordConfirm,omitempty"`
 	Role            string             `json:"role,omitempty" bson:"role,omitempty"`
 	Provider        string             `json:"provider" bson:"provider"`
+	Photo           string             `json:"photo,omitempty" bson:"photo,omitempty"`
 	Verified        bool               `json:"verified,omitempty" bson:"verified,omitempty"`
 	CreatedAt       time.Time          `json:"created_at,omitempty" bson:"created_at,omitempty"`
 	UpdatedAt       time.Time          `json:"updated_at,omitempty" bson:"updated_at,omitempty"`
@@ -66,6 +70,7 @@ func FilteredResponse(user *DBResponse) UserResponse {
 		Name:      user.Name,
 		Role:      user.Role,
 		Provider:  user.Provider,
+		Photo:     user.Photo,
 		CreatedAt: user.CreatedAt,
 		UpdatedAt: user.UpdatedAt,
 	}

services/auth.service.impl.go

@@ -29,6 +29,8 @@ func (uc *AuthServiceImpl) SignUpUser(user *models.SignUpInput) (*models.DBRespo
 	user.PasswordConfirm = ""
 	user.Verified = true
 	user.Role = "user"
+	user.Photo = "default.png"
+	user.Provider = "local"
 
 	hashedPassword, _ := utils.HashPassword(user.Password)
 	user.Password = hashedPassword

services/user.service.go

@@ -5,4 +5,5 @@ import "github.com/wpcodevo/golang-mongodb/models"
 type UserService interface {
 	FindUserById(string) (*models.DBResponse, error)
 	FindUserByEmail(string) (*models.DBResponse, error)
+	UpsertUser(string, *models.UpdateDBUser) (*models.DBResponse, error)
 }

services/user.service.impl.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/wpcodevo/golang-mongodb/models"
+	"github.com/wpcodevo/golang-mongodb/utils"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -55,16 +56,16 @@ func (us *UserServiceImpl) FindUserByEmail(email string) (*models.DBResponse, er
 	return user, nil
 }
 
-func (uc *UserServiceImpl) UpdateUser(id string, data *models.UpdateDBUser) (*models.DBResponse, error) {
+func (uc *UserServiceImpl) UpsertUser(email string, data *models.UpdateDBUser) (*models.DBResponse, error) {
 	doc, err := utils.ToDoc(data)
 	if err != nil {
 		return nil, err
 	}
 
-	obId, _ := primitive.ObjectIDFromHex(id)
-	query := bson.D{{Key: "_id", Value: obId}}
+	opts := options.FindOneAndUpdate().SetUpsert(true).SetReturnDocument(1)
+	query := bson.D{{Key: "email", Value: email}}
 	update := bson.D{{Key: "$set", Value: doc}}
-	res := uc.collection.FindOneAndUpdate(uc.ctx, query, update, options.FindOneAndUpdate().SetReturnDocument(1))
+	res := uc.collection.FindOneAndUpdate(uc.ctx, query, update, opts)
 
 	var updatedPost *models.DBResponse
 

tmp/build-errors.log

@@ -1 +1 @@
-exit status 2exit status 2exit status 2exit status 2
+exit status 2exit status 2exit status 2exit status 2exit status 2

utils/helper.go

@@ -0,0 +1,13 @@
+package utils
+
+import "go.mongodb.org/mongo-driver/bson"
+
+func ToDoc(v interface{}) (doc *bson.D, err error) {
+	data, err := bson.Marshal(v)
+	if err != nil {
+		return
+	}
+
+	err = bson.Unmarshal(data, &doc)
+	return
+}