model refactor and user relation complete

.github/workflows/test-deploy.yml

@@ -54,6 +54,7 @@ jobs:
           JWT_SECRET: ${{ secrets.JWT_SECRET }}
           DB_URI: ${{ secrets.DB_URI }}
         run: |
+          cd docker
           echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
           docker build --build-arg JWT_SECRET=${JWT_SECRET} --build-arg DB_URI=${DB_URI} -t piyush7833/chat-api:latest .
           docker push piyush7833/chat-api:latest

config/Alias/tableAlias.go

@@ -0,0 +1,11 @@
+package alias
+
+var mainAlias = "t"
+
+func GetUserRelationAlias() map[string]string {
+	return map[string]string{
+		"userRelation": mainAlias,
+		"user":         "u1",
+		"relatedUser":  "u2",
+	}
+}

config/constants.go

@@ -1,4 +1,6 @@
 package config
 
+import "time"
+
 const RowsPerPageGenral = 20
-const CtxTimeout = 5
+const CtxTimeout = 5 * time.Second

config/defaultColumns.go

@@ -0,0 +1,9 @@
+package config
+
+func GetUserDefaultColumns() []string {
+	return []string{"id", "name", "username", "email", "phone", "image", "createdAt"}
+}
+
+func GetDefaultUserRelationColumns() []string {
+	return []string{"id", "userId", "relatedUserId", "user_name", "related_user_name", "status", "createdAt", "updatedAt"}
+}

config/joinColumns.go

@@ -0,0 +1,14 @@
+package config
+
+func GetJoinUserRelationColumns(ogAlias string, userAlias string, relatedUserAlias string) map[string]string {
+	return map[string]string{
+		"id":                ogAlias + ".id",
+		"userId":            ogAlias + ".userId",
+		"user_name":         userAlias + ".name",
+		"relatedUserId":     ogAlias + ".relatedUserId",
+		"related_user_name": relatedUserAlias + ".name",
+		"status":            ogAlias + ".status",
+		"createdAt":         ogAlias + ".createdAt",
+		"updatedAt":         ogAlias + ".updatedAt",
+	}
+}

config/validColumns.go

@@ -0,0 +1,38 @@
+package config
+
+func GetValidUserColumns() map[string]bool {
+	return map[string]bool{
+		"id":            true,
+		"name":          true,
+		"username":      true,
+		"email":         true,
+		"phone":         true,
+		"image":         true,
+		"lastSeen":      true,
+		"isOnline":      true,
+		"phoneVerified": true,
+		"emailVerified": true,
+		"createdAt":     true,
+	}
+}
+
+func UpdateValidUserColumns() map[string]bool {
+	return map[string]bool{
+		"name":  true,
+		"email": true,
+		"image": true,
+		"phone": true,
+	}
+}
+func GetValidUserRelationColumns() map[string]bool {
+	return map[string]bool{
+		"id":                true,
+		"userId":            true,
+		"user_name":         true,
+		"relatedUserId":     true,
+		"related_user_name": true,
+		"status":            true,
+		"createdAt":         true,
+		"updatedAt":         true,
+	}
+}

controllers/auth.go

@@ -12,7 +12,8 @@ func Signup(w http.ResponseWriter, r *http.Request) {
 	// Read the request body
 	var user types.SignupType
 	err := helpers.GetBodyInJson(r, &user)
-	if helpers.CheckNilErr(err, "Error in retriving body", w) {
+	if err != nil {
+		helpers.Error(w, 500, err.Error())
 		return
 	}
 	res, error := functions.SignUp(user)
@@ -24,9 +25,12 @@ func Signup(w http.ResponseWriter, r *http.Request) {
 }
 
 func SignIn(w http.ResponseWriter, r *http.Request) {
+	// fmt.Println("Signin")
 	var user types.SignInType
 	err := helpers.GetBodyInJson(r, &user)
-	if helpers.CheckNilErr(err, "Error in retriving body", w) {
+	// fmt.Println(user, "user from controller")
+	if err != nil {
+		helpers.Error(w, 500, err.Error())
 		return
 	}
 	res, error := functions.Signin(user, w)

controllers/user-relation.go

@@ -0,0 +1,100 @@
+package controllers
+
+import (
+	"net/http"
+
+	"github.com/gorilla/context"
+	"github.com/piyush7833/Chat-Api/config"
+	"github.com/piyush7833/Chat-Api/functions"
+	"github.com/piyush7833/Chat-Api/helpers"
+	"github.com/piyush7833/Chat-Api/types"
+)
+
+func CreateUserRelations(w http.ResponseWriter, r *http.Request) {
+	JwtData := context.Get(r, "userId").(*helpers.Claims)
+	var relation types.CreateUserRelationType
+	err := helpers.GetBodyInJson(r, &relation)
+	if err != nil {
+		helpers.Error(w, 500, err.Error())
+		return
+	}
+	var senderId = JwtData.Id
+	var status = "pending"
+	if relation.RelatedUserId == nil {
+		helpers.Error(w, 500, "ReceiverId is required")
+		return
+	}
+	relation.UserId = &senderId
+	relation.Status = &status
+	res, error := functions.CreateUserRelation(relation)
+	if error.StatusCode != 0 {
+		// fmt.Println(error.StatusCode, error.Message, "error from fucntion")
+		helpers.Error(w, error.StatusCode, error.Message)
+		return
+	}
+	helpers.Success(w, 201, res, "User relation created sent successfully")
+}
+
+func UpdateUserRelations(w http.ResponseWriter, r *http.Request) {
+	JwtData := context.Get(r, "userId").(*helpers.Claims)
+	queryValues := r.URL.Query()
+	id := queryValues.Get("id")
+	var relation types.UpdateUserRelationType
+	err := helpers.GetBodyInJson(r, &relation)
+	if err != nil {
+		helpers.Error(w, 500, err.Error())
+		return
+	}
+	res, error := functions.UpdateUserRelation(relation, id, JwtData.Id)
+	if error.StatusCode != 0 {
+		helpers.Error(w, error.StatusCode, error.Message)
+		return
+	}
+	helpers.Success(w, 200, res, "Relation updated successfully")
+}
+
+func GetAllUserRelations(w http.ResponseWriter, r *http.Request) {
+	JwtData := context.Get(r, "userId").(*helpers.Claims)
+	queryValues := r.URL.Query()
+
+	status := helpers.ProcessQuerryParams(queryValues["status"], []string{"all"}, "string").(string)
+	relation_type := helpers.ProcessQuerryParams(queryValues["type"], []string{"all"}, "string").(string)
+	page := helpers.ProcessQuerryParams(queryValues["page"], []string{"0"}, "number").(int)
+	selectedColumns := helpers.ProcessQuerryParams(queryValues["columns"], config.GetDefaultUserRelationColumns(), "array").([]string)
+	orderBy := helpers.ProcessQuerryParams(queryValues["orderBy"], []string{"createdAt"}, "array").([]string)
+	isDesc := helpers.ProcessQuerryParams(queryValues["isDesc"], []string{"true"}, "bool").(bool)
+
+	res, error := functions.GetAllUserRelations(status, page, selectedColumns, JwtData.Id, relation_type, orderBy, isDesc)
+	if error.StatusCode != 0 {
+		helpers.Error(w, error.StatusCode, error.Message)
+		return
+	}
+	helpers.Success(w, 200, res, "Relations fetched successfully")
+}
+
+func GetParticularUserRelations(w http.ResponseWriter, r *http.Request) {
+	JwtData := context.Get(r, "userId").(*helpers.Claims)
+	queryValues := r.URL.Query()
+
+	id := helpers.ProcessQuerryParams(queryValues["id"], []string{""}, "string").(string)
+	var selectedColumns = helpers.ProcessQuerryParams(queryValues["columns"], config.GetDefaultUserRelationColumns(), "array").([]string)
+
+	res, error := functions.GetParticularUserRelation(id, selectedColumns, JwtData.Id)
+	if error.StatusCode != 0 {
+		helpers.Error(w, error.StatusCode, error.Message)
+		return
+	}
+	helpers.Success(w, 200, res, "Relation fetched successfully")
+}
+
+func DeleteUserRelations(w http.ResponseWriter, r *http.Request) { //unrelate
+	JwtData := context.Get(r, "userId").(*helpers.Claims)
+	queryValues := r.URL.Query()
+	id := queryValues.Get("id")
+	res, error := functions.DeleteUserRelations(id, JwtData.Id)
+	if error.StatusCode != 0 {
+		helpers.Error(w, error.StatusCode, error.Message)
+		return
+	}
+	helpers.Success(w, 200, res, "Relation deleted successfully")
+}