Merge branch 'dev' into fix/email-service-revamp

hngprojects · Aug 10, 2024 · 60d77de · 60d77de
2 parents b63fecd + 9060a21
commit 60d77de
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 20 deletions.
diff --git a/internal/models/contact.go b/internal/models/contact.go
@@ -13,7 +13,6 @@ type ContactUs struct {
 	ID        string         `gorm:"type:uuid;primary_key;" json:"id"`
 	Name      string         `gorm:"type:varchar(100);not null" json:"name" binding:"required" validate:"required"`
 	Email     string         `gorm:"type:varchar(100);not null;index" json:"email" binding:"required" validate:"required,email"`
-	Subject   string         `gorm:"type:varchar(255);not null" json:"subject" binding:"required" validate:"required"`
 	Message   string         `gorm:"type:text;not null" json:"message" binding:"required" validate:"required"`
 	CreatedAt time.Time      `gorm:"type:timestamp;default:current_timestamp" json:"created_at"`
 	UpdatedAt time.Time      `gorm:"type:timestamp;default:current_timestamp" json:"updated_at"`

diff --git a/internal/models/notification.go b/internal/models/notification.go
@@ -48,7 +48,6 @@ type SendSqueeze struct {
 type SendContactUsMail struct {
 	Name    string `json:"name"  validate:"required"`
 	Email   string `json:"email" `
-	Subject string `son:"subject" validate:"required"`
 	Message string `json:"message" validate:"required"`
 }
 

diff --git a/services/contact/contact.go b/services/contact/contact.go
@@ -34,7 +34,6 @@ func GetAllContactUs(c *gin.Context, db *gorm.DB) ([]models.ContactUs, *postgres
 
 func AddToContactUs(contact *models.ContactUs, db *gorm.DB) error {
 
-	contact.Subject = utility.CleanStringInput(contact.Subject)
 	contact.Message = utility.CleanStringInput(contact.Message)
 
 	if err := contact.CreateContactUs(db); err != nil {
@@ -44,7 +43,6 @@ func AddToContactUs(contact *models.ContactUs, db *gorm.DB) error {
 	msgReq := models.ContactUs{
 		Email:   contact.Email,
 		Name:    contact.Name,
-		Subject: contact.Subject,
 		Message: contact.Message,
 	}
 

diff --git a/tests/test_categories/category_test.go b/tests/test_categories/category_test.go
@@ -73,7 +73,6 @@ func TestGetCategoryNames(t *testing.T) {
 			t.Fatalf("Could not parse response: %v", err)
 		}
 
-		assert.Equal(t, "success", response["status"])
 		assert.Equal(t, float64(200), response["status_code"])
 		assert.Equal(t, "Categories fetched successfully", response["message"])
 

diff --git a/tests/test_contact/create_test.go b/tests/test_contact/create_test.go
@@ -54,7 +54,6 @@ func TestAddToContactUs(t *testing.T) {
 		contactData := models.ContactUs{
 			Name:    "John Doe",
 			Email:   "[email protected]",
-			Subject: "</br><i>Inquiry about services3 with html",
 			Message: "I would like to know more about your services3.",
 		}
 		payload, _ := json.Marshal(contactData)
@@ -115,7 +114,6 @@ func TestAddToContactUs(t *testing.T) {
 		contactData := models.ContactUs{
 			Name:    "John Doe",
 			Email:   "invalid_email",
-			Subject: "test subject",
 			Message: "message test",
 		}
 		payload, _ := json.Marshal(contactData)

diff --git a/tests/test_contact/delete_test.go b/tests/test_contact/delete_test.go
@@ -40,7 +40,6 @@ func TestDeleteContactUs(t *testing.T) {
 	contact := models.ContactUs{
 		ID:      utility.GenerateUUID(),
 		Email:   fmt.Sprintf("contact%[email protected]", currUUID),
-		Subject: fmt.Sprintf("Test subject - %v ", currUUID),
 		Message: fmt.Sprintf("Test message - %v ", currUUID),
 	}
 

diff --git a/tests/test_contact/get_test.go b/tests/test_contact/get_test.go
@@ -40,13 +40,11 @@ func TestGetAllContactUs(t *testing.T) {
 	contact1 := models.ContactUs{
 		ID:      utility.GenerateUUID(),
 		Email:   fmt.Sprintf("contact%[email protected]", currUUID),
-		Subject: fmt.Sprintf("First subject - %v ", currUUID),
 		Message: fmt.Sprintf("First test message - %v ", currUUID),
 	}
 	contact2 := models.ContactUs{
 		ID:      utility.GenerateUUID(),
 		Email:   fmt.Sprintf("contact2%[email protected]", currUUID),
-		Subject: fmt.Sprintf("Second subject - %v ", currUUID),
 		Message: fmt.Sprintf("Second test message - %v ", currUUID),
 	}
 
@@ -149,7 +147,6 @@ func TestGetContactUsById(t *testing.T) {
 	contact := models.ContactUs{
 		ID:      utility.GenerateUUID(),
 		Email:   fmt.Sprintf("contact%[email protected]", currUUID),
-		Subject: fmt.Sprintf("Test subject - %v ", currUUID),
 		Message: fmt.Sprintf("Test message - %v ", currUUID),
 	}
 
@@ -251,7 +248,6 @@ func TestGetContactUsByEmail(t *testing.T) {
 	contact := models.ContactUs{
 		ID:      utility.GenerateUUID(),
 		Email:   fmt.Sprintf("contact%[email protected]", currUUID),
-		Subject: fmt.Sprintf("Test subject - %v ", currUUID),
 		Message: fmt.Sprintf("Test message - %v ", currUUID),
 	}
 

diff --git a/tests/test_users/get_user_privacy_test.go b/tests/test_users/get_user_privacy_test.go
@@ -79,7 +79,6 @@ func TestGetUserDataPrivacy(t *testing.T) {
 
 		tests.AssertStatusCode(t, resp.Code, http.StatusOK)
 		response := tests.ParseResponse(resp)
-		tests.AssertResponseMessage(t, response["status"].(string), "success")
 		tests.AssertResponseMessage(t, response["message"].(string), "User data privacy settings retrieved successfully")
 	})
 
@@ -134,7 +133,6 @@ func TestGetUserDataPrivacy(t *testing.T) {
 
 		tests.AssertStatusCode(t, resp.Code, http.StatusNotFound)
 		response := tests.ParseResponse(resp)
-		tests.AssertResponseMessage(t, response["status"].(string), "error")
 		tests.AssertResponseMessage(t, response["message"].(string), "user not found")
 	})
 }
diff --git a/tests/test_users/get_user_region_test.go b/tests/test_users/get_user_region_test.go
@@ -75,7 +75,6 @@ func TestGetUserRegion(t *testing.T) {
 
 		tests.AssertStatusCode(t, resp.Code, http.StatusOK)
 		response := tests.ParseResponse(resp)
-		tests.AssertResponseMessage(t, response["status"].(string), "success")
 		tests.AssertResponseMessage(t, response["message"].(string), "User region retrieved successfully")
 
 	})
@@ -131,7 +130,6 @@ func TestGetUserRegion(t *testing.T) {
 
 		tests.AssertStatusCode(t, resp.Code, http.StatusNotFound)
 		response := tests.ParseResponse(resp)
-		tests.AssertResponseMessage(t, response["status"].(string), "error")
 		tests.AssertResponseMessage(t, response["message"].(string), "user not found")
 	})
 }
diff --git a/tests/test_users/update_user_privacy_test.go b/tests/test_users/update_user_privacy_test.go
@@ -92,7 +92,6 @@ func TestUpdateUserDataPrivacy(t *testing.T) {
 
 		tests.AssertStatusCode(t, resp.Code, http.StatusOK)
 		response := tests.ParseResponse(resp)
-		tests.AssertResponseMessage(t, response["status"].(string), "success")
 		tests.AssertResponseMessage(t, response["message"].(string), "User data privacy settings updated successfully")
 	})
 
@@ -124,7 +123,6 @@ func TestUpdateUserDataPrivacy(t *testing.T) {
 
 		tests.AssertStatusCode(t, resp.Code, http.StatusOK)
 		response := tests.ParseResponse(resp)
-		tests.AssertResponseMessage(t, response["status"].(string), "success")
 		tests.AssertResponseMessage(t, response["message"].(string), "User data privacy settings updated successfully")
 	})
 
@@ -181,7 +179,6 @@ func TestUpdateUserDataPrivacy(t *testing.T) {
 
 		tests.AssertStatusCode(t, resp.Code, http.StatusNotFound)
 		response := tests.ParseResponse(resp)
-		tests.AssertResponseMessage(t, response["status"].(string), "error")
 		tests.AssertResponseMessage(t, response["message"].(string), "user not found")
 	})
 }
diff --git a/utility/response.go b/utility/response.go
@@ -49,7 +49,6 @@ func ResponseMessage(code int, status string, name string, message string, err i
 	res := Response{
 		StatusCode: code,
 		Name:       name,
-		Status:     status,
 		Message:    message,
 		Error:      err,
 		Data:       data,