Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions server/action/medium/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,13 @@ func delete(w http.ResponseWriter, r *http.Request) {
return
}

err = model.DB.Model(&model.Space{}).Where(&model.Space{MediumID: &result.ID}).Update("medium_id", nil).Error
if err != nil {
loggerx.Error(err)
errorx.Render(w, errorx.Parser(errorx.DBError()))
return
}

model.DB.Delete(&result)
renderx.JSON(w, http.StatusOK, nil)
}
1 change: 1 addition & 0 deletions server/action/organisation/application/space/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ func create(w http.ResponseWriter, r *http.Request) {
ID: uint(uID),
},
})

err = tx.Model(&model.Space{}).Create(&space).Error
if err != nil {
tx.Rollback()
Expand Down
4 changes: 4 additions & 0 deletions server/action/organisation/application/space/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ func delete(w http.ResponseWriter, r *http.Request) {
errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
return
}
// delete the medium associated with the space
if space.MediumID != nil {
err = tx.Model(&model.Medium{}).Where("id = ?", *space.MediumID).Delete(&model.Medium{}).Error
}

err = tx.Model(&model.Space{}).Where("id = ?", space.ID).Delete(space).Error
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion server/action/organisation/application/space/details.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func details(w http.ResponseWriter, r *http.Request) {
Base: model.Base{
ID: uint(sID),
},
}).Preload("Users").Preload("Organisation").Preload("Application").Preload("Tokens").Find(&space).Error
}).Preload("Users").Preload("Organisation").Preload("Application").Preload("Tokens").Preload("Medium").Find(&space).Error
if err != nil {
loggerx.Error(err)
errorx.Render(w, errorx.Parser(errorx.DBError()))
Expand Down
1 change: 1 addition & 0 deletions server/action/organisation/application/space/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ func list(w http.ResponseWriter, r *http.Request) {
ID: uint(spaceID),
},
}).Preload("Users").Preload("Organisation").Preload("Application").Preload("Tokens").
Preload("Medium").
Find(&space).Error
if err != nil {
loggerx.Error(err)
Expand Down
9 changes: 8 additions & 1 deletion server/action/organisation/application/space/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,15 @@ func update(w http.ResponseWriter, r *http.Request) {
"name": space.Name,
"slug": space.Slug,
"description": space.Description,
"meta_fields": space.MetaFields,
"meta_fields": space.MetaFields,
}

if space.MediumID == nil {
updateMap["medium_id"] = nil
} else {
updateMap["medium_id"] = *space.MediumID
}

updatedSpace := new(model.Space)
err = tx.Model(&model.Space{}).Where("id = ?", space.ID).Updates(updateMap).First(updatedSpace).Error
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions server/model/medium.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ type Medium struct {
URL postgres.Jsonb `gorm:"column:url" json:"url" swaggertype:"primitive,string"`
Dimensions string `gorm:"column:dimensions" json:"dimensions"`
UserID uint `gorm:"column:user_id" json:"user_id"`
Space *Space `gorm:"foreignKey:MediumID" json:"space"`
}

// TableName medium table name
Expand Down
2 changes: 2 additions & 0 deletions server/model/space.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ type Space struct {
Organisation *Organisation `gorm:"foreignKey:organisation_id" json:"organisation"`
ApplicationID uint `gorm:"column:application_id" json:"application_id"`
Application *Application `gorm:"foreignKey:application_id" json:"application"`
MediumID *uint `gorm:"column:medium_id" json:"medium_id,omitempty"`
Medium *Medium `gorm:"foreignKey:medium_id" json:"medium,omitempty"`
Users []User `gorm:"many2many:space_users;" json:"users"`
Roles []SpaceRole `gorm:"many2many:space_roles;" json:"roles"`
Tokens []SpaceToken `json:"tokens"`
Expand Down