Feature/task creation hifi

README.md

@@ -17,12 +17,12 @@
 
 ## Stack
 
-[![Go](https://img.shields.io/badge/go-%2300ADD8.svg?style=for-the-badge&logo=go&logoColor=white)](https://go.dev/doc/)
-[![Postgres](https://img.shields.io/badge/postgres-%23316192.svg?style=for-the-badge&logo=postgresql&logoColor=white)](https://www.postgresql.org/)
+![Go](https://img.shields.io/badge/go-%2300ADD8.svg?style=for-the-badge&logo=go&logoColor=white)
+![Postgres](https://img.shields.io/badge/postgres-%23316192.svg?style=for-the-badge&logo=postgresql&logoColor=white)
 
-[![TypeScript](https://img.shields.io/badge/typescript-%23007ACC.svg?style=for-the-badge&logo=typescript&logoColor=white)](https://www.typescriptlang.org/)
-[![React Native](https://img.shields.io/badge/react_native-%2320232a.svg?style=for-the-badge&logo=react&logoColor=%2361DAFB)](https://reactnative.dev/)
-[![TailwindCSS](https://img.shields.io/badge/tailwindcss-%2338B2AC.svg?style=for-the-badge&logo=tailwind-css&logoColor=white)](https://tailwindcss.com/)
+![TypeScript](https://img.shields.io/badge/typescript-%23007ACC.svg?style=for-the-badge&logo=typescript&logoColor=white)
+![React Native](https://img.shields.io/badge/react_native-%2320232a.svg?style=for-the-badge&logo=react&logoColor=%2361DAFB)
+![TailwindCSS](https://img.shields.io/badge/tailwindcss-%2338B2AC.svg?style=for-the-badge&logo=tailwind-css&logoColor=white)
 
 ## Tools
 

backend/db/migrations/5.files.sql

@@ -8,8 +8,6 @@ CREATE TABLE IF NOT EXISTS files (
     upload_date timestamp,
     file_size integer NOT NULL,
     task_id integer,
-    notes varchar,
-    label_name varchar,
     PRIMARY KEY (file_id),
     FOREIGN KEY (group_id) REFERENCES care_group (group_id),
     FOREIGN KEY (upload_by) REFERENCES users (user_id),

backend/db/migrations/init.sql

@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS medication;
+
+CREATE TABLE IF NOT EXISTS medication (
+    medication_id integer NOT NULL UNIQUE,
+    medication_name varchar NOT NULL,
+    PRIMARY KEY (medication_id)
+);
+
+INSERT INTO medication (medication_id, medication_name)
+VALUES
+  (1, 'Medication A'),
+  (2, 'Medication B'),
+  (3, 'Medication C'),
+  (4, 'Medication D'),
+  (5, 'Medication E')
+;

backend/docs/docs.go

@@ -43,19 +43,6 @@ const docTemplate = `{
                         "name": "group_id",
                         "in": "formData",
                         "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "Notes for the file",
-                        "name": "notes",
-                        "in": "formData",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "Label name for the file",
-                        "name": "label_name",
-                        "in": "formData"
                     }
                 ],
                 "responses": {
@@ -522,6 +509,58 @@ const docTemplate = `{
                 }
             }
         },
+        "/medications": {
+            "get": {
+                "description": "get all user medications",
+                "tags": [
+                    "medications"
+                ],
+                "summary": "Get All Meds",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.Medication"
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "description": "add a medication to a users medlist",
+                "tags": [
+                    "medications"
+                ],
+                "summary": "add a medication",
+                "parameters": [
+                    {
+                        "description": "a medication",
+                        "name": "_",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.Medication"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/models.Medication"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
         "/tasks": {
             "post": {
                 "description": "Create a new task",
@@ -1184,12 +1223,6 @@ const docTemplate = `{
                 "group_id": {
                     "type": "integer"
                 },
-                "label_name": {
-                    "type": "string"
-                },
-                "notes": {
-                    "type": "string"
-                },
                 "task_id": {
                     "type": "integer"
                 },
@@ -1229,6 +1262,17 @@ const docTemplate = `{
                 }
             }
         },
+        "models.Medication": {
+            "type": "object",
+            "properties": {
+                "medication_id": {
+                    "type": "integer"
+                },
+                "medication_name": {
+                    "type": "string"
+                }
+            }
+        },
         "models.Role": {
             "type": "string",
             "enum": [

backend/docs/swagger.json

@@ -36,19 +36,6 @@
                         "name": "group_id",
                         "in": "formData",
                         "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "Notes for the file",
-                        "name": "notes",
-                        "in": "formData",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "Label name for the file",
-                        "name": "label_name",
-                        "in": "formData"
                     }
                 ],
                 "responses": {
@@ -515,6 +502,58 @@
                 }
             }
         },
+        "/medications": {
+            "get": {
+                "description": "get all user medications",
+                "tags": [
+                    "medications"
+                ],
+                "summary": "Get All Meds",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.Medication"
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "description": "add a medication to a users medlist",
+                "tags": [
+                    "medications"
+                ],
+                "summary": "add a medication",
+                "parameters": [
+                    {
+                        "description": "a medication",
+                        "name": "_",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.Medication"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/models.Medication"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
         "/tasks": {
             "post": {
                 "description": "Create a new task",
@@ -1177,12 +1216,6 @@
                 "group_id": {
                     "type": "integer"
                 },
-                "label_name": {
-                    "type": "string"
-                },
-                "notes": {
-                    "type": "string"
-                },
                 "task_id": {
                     "type": "integer"
                 },
@@ -1222,6 +1255,17 @@
                 }
             }
         },
+        "models.Medication": {
+            "type": "object",
+            "properties": {
+                "medication_id": {
+                    "type": "integer"
+                },
+                "medication_name": {
+                    "type": "string"
+                }
+            }
+        },
         "models.Role": {
             "type": "string",
             "enum": [

backend/docs/swagger.yaml

@@ -33,10 +33,6 @@ definitions:
         type: integer
       group_id:
         type: integer
-      label_name:
-        type: string
-      notes:
-        type: string
       task_id:
         type: integer
       upload_by:
@@ -62,6 +58,13 @@ definitions:
       label_name:
         type: string
     type: object
+  models.Medication:
+    properties:
+      medication_id:
+        type: integer
+      medication_name:
+        type: string
+    type: object
   models.Role:
     enum:
     - PATIENT
@@ -234,15 +237,6 @@ paths:
         name: group_id
         required: true
         type: integer
-      - description: Notes for the file
-        in: formData
-        name: notes
-        required: true
-        type: string
-      - description: Label name for the file
-        in: formData
-        name: label_name
-        type: string
       responses:
         "200":
           description: OK
@@ -554,6 +548,40 @@ paths:
       summary: Retrieve a group id given a user id
       tags:
       - group
+  /medications:
+    get:
+      description: get all user medications
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.Medication'
+            type: array
+      summary: Get All Meds
+      tags:
+      - medications
+    post:
+      description: add a medication to a users medlist
+      parameters:
+      - description: a medication
+        in: body
+        name: _
+        required: true
+        schema:
+          $ref: '#/definitions/models.Medication'
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/models.Medication'
+        "400":
+          description: Bad Request
+          schema:
+            type: string
+      summary: add a medication
+      tags:
+      - medications
   /tasks:
     post:
       description: Create a new task

backend/main.go

@@ -8,6 +8,7 @@ import (
 	groupRoles "carewallet/schema/group-roles"
 	"carewallet/schema/groups"
 	"carewallet/schema/labels"
+	"carewallet/schema/medication"
 	"carewallet/schema/task_labels"
 	"carewallet/schema/tasks"
 	"carewallet/schema/user"
@@ -50,6 +51,8 @@ func main() {
 
 	v1 := r.Group("/")
 	{
+		medication.GetMedicationGroup(v1, &medication.PgModel{Conn: conn})
+
 		files.FileGroup(v1, &files.PgModel{Conn: conn})
 
 		user.UserGroup(v1, &user.PgModel{Conn: conn})

backend/models/file.go

@@ -8,6 +8,4 @@ type File struct {
 	UploadDate string `json:"upload_date"`
 	FileSize   int64  `json:"file_size"`
 	TaskID     int    `json:"task_id"`
-	Notes      string `json:"notes"`
-	LabelName  string `json:"label_name"`
 }

backend/models/medication.go

@@ -0,0 +1,6 @@
+package models
+
+type Medication struct {
+	MedicationID   int    `json:"medication_id"`
+	MedicationName string `json:"medication_name"`
+}

backend/schema/files/routes.go

@@ -32,8 +32,6 @@ func FileGroup(v1 *gin.RouterGroup, c *PgModel) *gin.RouterGroup {
 //	@param			file_data	formData	file	true	"Body with file zip"
 //	@param			upload_by	formData	string	true	"The userId of the uploader"
 //	@param			group_id	formData	int		true	"The groupId of the uploader"
-//	@param			notes		formData	string	true	"Notes for the file"
-//	@param			label_name	formData	string	false	"Label name for the file"
 //
 //	@success		200			{object}	models.File
 //	@failure		400			{object}	string
@@ -50,8 +48,6 @@ func (pg *PgModel) UploadFile(c *gin.Context) {
 	fileResponse := form.File["file_data"][0]
 	file.UploadBy = form.Value["upload_by"][0]
 	file.GroupID, err = strconv.Atoi(form.Value["group_id"][0])
-	file.Notes = form.Value["notes"][0]
-	file.LabelName = form.Value["label_name"][0]
 
 	if err != nil {
 		c.JSON(http.StatusBadRequest, "Failed to parse groupid")