improvment to code

.postman/config.json

@@ -0,0 +1,14 @@
+{
+  "workspace": {
+    "id": "2bd7d4b3-6122-42d7-8bc2-ec10cc8929fd"
+  },
+  "entities": {
+    "collections": [
+      "../postman/collections/message_db endpoint tests.postman_collection.json"
+    ],
+    "environments": [],
+    "specs": [],
+    "flows": [],
+    "globals": []
+  }
+}

README.md

@@ -1,7 +1,13 @@
 # sqlc-example-api
 
-This repository provides starter code for creating a API using sqlc and the Gin web framework in Go. This is part of the Relational Database course as part of the Iknite Space training.
+This repository provides code for creating a API using sqlc and the Gin web framework in Go. This is an improvement for the started code that was provided. 
+This code support the creation of users, 
+starting of direct messages(chat between two users), 
+creation of group and adding of members, 
+threads(within a group which can be left as public or set to restricted to a few users) and adding of members,
+messages(which can be dm, group or thread messages)
 
+link to api documentation: https://documenter.getpostman.com/view/50168458/2sB3dLVXe9
 
 Project Structure
 

api/api.go

@@ -26,14 +26,30 @@ func (h *MessageHandler) WireHttpHandler() http.Handler {
 	}))
 
 	r.POST("/message", h.handleCreateMessage)
-	r.GET("/message/:id", h.handleGetMessage)
-	r.GET("/thread/:id/messages", h.handleGetThreadMessages)
+	r.POST("/user", h.handleAddUser)
+	r.POST("/group", h.handleCreateGroup)
+	r.POST("/thread", h.handleStartThread)
+	r.POST("/group/member", h.handleAddGroupMember)
+	r.POST("/thread/member", h.handleAddThreadMember)
+	r.POST("/dm", h.handleStartDm)
+
+	r.GET("/message/:message_id", h.handleGetMessage)
+	r.GET("/message/dm/:dm_id", h.handleGetDmMessage)
+	r.GET("/message/group/:group_id", h.handleGetGroupMessage)
+	r.GET("/message/thread/:thread_id", h.handleGetThreadMessage)
+	r.GET("/user/group/:user_id", h.handleGetUserGroup)
+	r.GET("/user/thread/:user_id", h.handleGetUserThread)
+	r.GET("/user/group/creator/:user_id", h.handleGetGroupsUserCreated)
+	r.GET("/user/thread/creator/:user_id", h.handleGetThreadsUserStarted)
+	r.GET("/group/thread/:group_id", h.handleGetGroupThread)
+	r.GET("/group/group-list", h.handleGetListOfGroups)
 
 	return r
 }
 
 func (h *MessageHandler) handleCreateMessage(c *gin.Context) {
 	var req repo.CreateMessageParams
+
 	err := c.ShouldBindBodyWithJSON(&req)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
@@ -49,10 +65,118 @@ func (h *MessageHandler) handleCreateMessage(c *gin.Context) {
 	c.JSON(http.StatusOK, message)
 }
 
+func (h *MessageHandler) handleAddUser(c *gin.Context) {
+	var req repo.AddUserParams
+
+	err := c.ShouldBindBodyWithJSON(&req)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	message, err := h.querier.AddUser(c, req)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleCreateGroup(c *gin.Context) {
+	var req repo.CreateGroupParams
+
+	err := c.ShouldBindBodyWithJSON(&req)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	message, err := h.querier.CreateGroup(c, req)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleStartThread(c *gin.Context) {
+	var req repo.StartThreadParams
+
+	err := c.ShouldBindBodyWithJSON(&req)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	message, err := h.querier.StartThread(c, req)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleAddGroupMember(c *gin.Context) {
+	var req repo.AddGroupMemberParams
+
+	err := c.ShouldBindBodyWithJSON(&req)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	message, err := h.querier.AddGroupMember(c, req)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleAddThreadMember(c *gin.Context) {
+	var req repo.AddThreadMemberParams
+
+	err := c.ShouldBindBodyWithJSON(&req)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	message, err := h.querier.AddThreadMember(c, req)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleStartDm(c *gin.Context) {
+	var req repo.StartDmParams
+
+	err := c.ShouldBindBodyWithJSON(&req)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	message, err := h.querier.StartDm(c, req)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
 func (h *MessageHandler) handleGetMessage(c *gin.Context) {
-	id := c.Param("id")
+	id := c.Param("message_id")
 	if id == "" {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "id is required"})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "message id is required"})
 		return
 	}
 
@@ -65,22 +189,141 @@ func (h *MessageHandler) handleGetMessage(c *gin.Context) {
 	c.JSON(http.StatusOK, message)
 }
 
-func (h *MessageHandler) handleGetThreadMessages(c *gin.Context) {
-	id := c.Param("id")
+func (h *MessageHandler) handleGetDmMessage(c *gin.Context) {
+	id := c.Param("dm_id")
+	if id == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "dm id is required"})
+		return
+	}
+
+	message, err := h.querier.GetDmMessages(c, id)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleGetGroupMessage(c *gin.Context) {
+	id := c.Param("group_id")
+	if id == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "group id is required"})
+		return
+	}
+
+	message, err := h.querier.GetGroupMessages(c, id)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleGetThreadMessage(c *gin.Context) {
+	id := c.Param("thread_id")
+	if id == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "thread id is required"})
+		return
+	}
+
+	message, err := h.querier.GetThreadMessages(c, id)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleGetUserGroup(c *gin.Context) {
+	id := c.Param("user_id")
+	if id == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "user id is required"})
+		return
+	}
+
+	message, err := h.querier.GetUserGroups(c, id)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleGetUserThread(c *gin.Context) {
+	id := c.Param("user_id")
 	if id == "" {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "id is required"})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "user id is required"})
 		return
 	}
 
-	messages, err := h.querier.GetMessagesByThread(c, id)
+	message, err := h.querier.GetUserThreads(c, id)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	c.JSON(http.StatusOK, gin.H{
-		"thread":   id,
-		"topic":    "example",
-		"messages": messages,
-	})
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleGetGroupsUserCreated(c *gin.Context) {
+	id := c.Param("user_id")
+	if id == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "user id is required"})
+		return
+	}
+
+	message, err := h.querier.GetGroupsUserCreated(c, id)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleGetThreadsUserStarted(c *gin.Context) {
+	id := c.Param("user_id")
+	if id == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "user id is required"})
+		return
+	}
+
+	message, err := h.querier.GetThreadsUserStarted(c, &id)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleGetGroupThread(c *gin.Context) {
+	id := c.Param("group_id")
+	if id == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "group id is required"})
+		return
+	}
+
+	message, err := h.querier.GetGroupThreads(c, id)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
+}
+
+func (h *MessageHandler) handleGetListOfGroups(c *gin.Context) {
+
+	message, err := h.querier.GetListOfGroups(c)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, message)
 }

db/migrations/000001_init_schema.down.sql

@@ -1,3 +1,14 @@
-DROP TABLE users;
+DROP TABLE IF EXISTS users;
+DROP TABLE IF EXISTS groups;
+DROP TABLE IF EXISTS threads;
+DROP TABLE IF EXISTS thread_members;
+DROP TABLE IF EXISTS gp_members;
+DROP TABLE IF EXISTS dms;
+DROP TABLE IF EXISTS messages;
+DROP TABLE IF EXISTS schema_migrations;
+
 DROP TYPE user_status;
-DROP TYPE identity_document;
+DROP TYPE identity_document;
+Drop TYPE IF EXISTS role_type;
+Drop TYPE IF EXISTS visibility_enum;
+Drop TYPE IF EXISTS chattype_enum;