Improve API

Author: JakobDev

modules/structs/org.go

@@ -8,7 +8,7 @@ type Organization struct {
 	ID                        int64  `json:"id"`
 	Name                      string `json:"name"`
 	FullName                  string `json:"full_name"`
-	EMail                     string `json:"email"`
+	Email                     string `json:"email"`
 	AvatarURL                 string `json:"avatar_url"`
 	Description               string `json:"description"`
 	Website                   string `json:"website"`
@@ -33,6 +33,7 @@ type CreateOrgOption struct {
 	// required: true
 	UserName    string `json:"username" binding:"Required;Username;MaxSize(40)"`
 	FullName    string `json:"full_name" binding:"MaxSize(100)"`
+	Email       string `json:"email" binding:"MaxSize(255)"`
 	Description string `json:"description" binding:"MaxSize(255)"`
 	Website     string `json:"website" binding:"ValidUrl;MaxSize(255)"`
 	Location    string `json:"location" binding:"MaxSize(50)"`
@@ -47,6 +48,7 @@ type CreateOrgOption struct {
 // EditOrgOption options for editing an organization
 type EditOrgOption struct {
 	FullName    string `json:"full_name" binding:"MaxSize(100)"`
+	Email       string `json:"email" binding:"MaxSize(255)"`
 	Description string `json:"description" binding:"MaxSize(255)"`
 	Website     string `json:"website" binding:"ValidUrl;MaxSize(255)"`
 	Location    string `json:"location" binding:"MaxSize(50)"`

routers/api/v1/org/org.go

@@ -255,6 +255,7 @@ func Create(ctx *context.APIContext) {
 	org := &organization.Organization{
 		Name:                      form.UserName,
 		FullName:                  form.FullName,
+		Email:                     form.Email,
 		Description:               form.Description,
 		Website:                   form.Website,
 		Location:                  form.Location,
@@ -304,7 +305,7 @@ func Get(ctx *context.APIContext) {
 
 	// Don't show Mail, when User is not logged in
 	if ctx.Doer == nil {
-		org.EMail = ""
+		org.Email = ""
 	}
 
 	ctx.JSON(http.StatusOK, org)
@@ -336,6 +337,7 @@ func Edit(ctx *context.APIContext) {
 	form := web.GetForm(ctx).(*api.EditOrgOption)
 	org := ctx.Org.Organization
 	org.FullName = form.FullName
+	org.Email = form.Email
 	org.Description = form.Description
 	org.Website = form.Website
 	org.Location = form.Location

services/convert/convert.go

@@ -289,7 +289,7 @@ func ToOrganization(ctx context.Context, org *organization.Organization) *api.Or
 		Name:                      org.Name,
 		UserName:                  org.Name,
 		FullName:                  org.FullName,
-		EMail:                     org.Email,
+		Email:                     org.Email,
 		Description:               org.Description,
 		Website:                   org.Website,
 		Location:                  org.Location,