|
@@ -30,42 +30,49 @@ type Class struct {
|
|
|
CoordinatorID uint `schema:"coordinator_id"`
|
|
|
MinuterID uint `schema:"minuter_id"`
|
|
|
|
|
|
- Coordinator Teacher
|
|
|
- Minuter Teacher
|
|
|
+ Coordinator *Teacher
|
|
|
+ Minuter *Teacher
|
|
|
|
|
|
Teachers []*Teacher
|
|
|
Activities []*Activity
|
|
|
Students []*Student
|
|
|
-}
|
|
|
-
|
|
|
-type ClassForUpdate struct {
|
|
|
- Class Class
|
|
|
- AllTeachers []*Teacher
|
|
|
- SelectedCoordinator map[uint]string
|
|
|
- SelectedMinuter map[uint]string
|
|
|
-}
|
|
|
|
|
|
-type ClassForAdd struct {
|
|
|
- AllTeachers []*Teacher
|
|
|
+ AllTeachers []*Teacher `gorm:"-"`
|
|
|
+ SelectedCoordinator map[uint]string `gorm:"-"`
|
|
|
+ SelectedMinuter map[uint]string `gorm:"-"`
|
|
|
}
|
|
|
|
|
|
func (t *Class) GetID() uint { return t.ID }
|
|
|
func (c *Class) String() string { return c.Name }
|
|
|
|
|
|
-func GetClass(args map[string]string) (interface{}, error) {
|
|
|
- var class Class
|
|
|
- if err := DB().First(&class, args["id"]).Error; err != nil {
|
|
|
- return nil, err
|
|
|
+func (c *Class) Create(args map[string]string, r *http.Request) (interface{}, error) {
|
|
|
+ if r.Method == "GET" {
|
|
|
+ class := new(Class)
|
|
|
+ if err := DB().Find(&class.AllTeachers).Error; err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ return class, nil
|
|
|
+ } else {
|
|
|
+ class := new(Class)
|
|
|
+ err := renderer.Decode(class, r)
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ class, err = CreateClass(class)
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+
|
|
|
+ return class, nil
|
|
|
}
|
|
|
- return &class, nil
|
|
|
}
|
|
|
|
|
|
-func GetClassAll(args map[string]string) (interface{}, error) {
|
|
|
+func (c *Class) Read(args map[string]string, r *http.Request) (interface{}, error) {
|
|
|
var class Class
|
|
|
|
|
|
id := args["id"]
|
|
|
|
|
|
- if err := DB().First(&class, id).Error; err != nil {
|
|
|
+ if err := DB().Preload("Coordinator").Preload("Minuter").Where("id = ?", id).Find(&class).Error; err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
|
|
@@ -77,133 +84,79 @@ func GetClassAll(args map[string]string) (interface{}, error) {
|
|
|
return nil, err
|
|
|
}
|
|
|
|
|
|
- if class.CoordinatorID != 0 {
|
|
|
- if !DB().First(&class.Coordinator, class.CoordinatorID).RecordNotFound() {
|
|
|
- if err := DB().First(&class.Coordinator, class.CoordinatorID).Error; err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if class.MinuterID != 0 {
|
|
|
- if !DB().First(&class.Minuter, class.MinuterID).RecordNotFound() {
|
|
|
- if err := DB().First(&class.Minuter, class.MinuterID).Error; err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
return &class, nil
|
|
|
}
|
|
|
|
|
|
-func GetClasses(args map[string]string) (interface{}, error) {
|
|
|
- var classes []*Class
|
|
|
- if err := DB().Order("name").Find(&classes).Error; err != nil {
|
|
|
+func (c *Class) ReadAll(args map[string]string, r *http.Request) (interface{}, error) {
|
|
|
+ var classs []*Class
|
|
|
+ if err := DB().Preload("Coordinator").Preload("Minuter").Order("name").Find(&classs).Error; err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
- return classes, nil
|
|
|
-}
|
|
|
-
|
|
|
-func GetClassesAll(args map[string]string) (interface{}, error) {
|
|
|
- var classes []*Class
|
|
|
- if err := DB().Order("name").Find(&classes).Error; err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- for _, class := range classes {
|
|
|
+ for _, class := range classs {
|
|
|
class.GetTeachers()
|
|
|
}
|
|
|
+ return classs, nil
|
|
|
+}
|
|
|
|
|
|
- for _, class := range classes {
|
|
|
- class.GetActivities()
|
|
|
- }
|
|
|
-
|
|
|
- for _, class := range classes {
|
|
|
- if class.CoordinatorID != 0 {
|
|
|
- if !DB().First(&class.Coordinator, class.CoordinatorID).RecordNotFound() {
|
|
|
- if err := DB().First(&class.Coordinator, class.CoordinatorID).Error; err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- }
|
|
|
+func (c *Class) Update(args map[string]string, r *http.Request) (interface{}, error) {
|
|
|
+ if r.Method == "GET" {
|
|
|
+ result, err := c.Read(args, r)
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
}
|
|
|
|
|
|
- if class.MinuterID != 0 {
|
|
|
- if !DB().First(&class.Minuter, class.MinuterID).RecordNotFound() {
|
|
|
- if err := DB().First(&class.Minuter, class.MinuterID).Error; err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- }
|
|
|
+ class := result.(*Class)
|
|
|
+
|
|
|
+ if err := DB().Find(&class.AllTeachers).Error; err != nil {
|
|
|
+ return nil, err
|
|
|
}
|
|
|
|
|
|
- }
|
|
|
+ class.SelectedMinuter = make(map[uint]string)
|
|
|
+ class.SelectedMinuter[class.MinuterID] = "selected"
|
|
|
|
|
|
- return classes, nil
|
|
|
-}
|
|
|
+ class.SelectedCoordinator = make(map[uint]string)
|
|
|
+ class.SelectedCoordinator[class.CoordinatorID] = "selected"
|
|
|
|
|
|
-func SaveClass(class interface{}) (interface{}, error) {
|
|
|
- if err := DB().Save(class).Error; err != nil {
|
|
|
- return nil, err
|
|
|
+ return class, nil
|
|
|
+ } else {
|
|
|
+ class, err := c.Read(args, r)
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ err = renderer.Decode(class, r)
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ _, err = SaveClass(class)
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ class, err = c.Read(args, r)
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ return class.(*Class), nil
|
|
|
}
|
|
|
- return class, nil
|
|
|
}
|
|
|
|
|
|
-func UpdateClass(args map[string]string, r *http.Request) (IDer, error) {
|
|
|
- class, err := GetClass(args)
|
|
|
- if err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- err = renderer.Decode(class, r)
|
|
|
+func (c *Class) Delete(args map[string]string, r *http.Request) (interface{}, error) {
|
|
|
+ class, err := c.Read(args, r)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
- _, err = SaveClass(class)
|
|
|
- if err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- class, err = GetClass(args)
|
|
|
- if err != nil {
|
|
|
+ if err := DB().Unscoped().Delete(class.(*Class)).Error; err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
return class.(*Class), nil
|
|
|
}
|
|
|
|
|
|
-func AddClass(args map[string]string, r *http.Request) (IDer, error) {
|
|
|
- class := new(Class)
|
|
|
- err := renderer.Decode(class, r)
|
|
|
- if err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- class, err = CreateClass(class)
|
|
|
- if err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- return class, nil
|
|
|
-}
|
|
|
-
|
|
|
-func CreateClass(class *Class) (*Class, error) {
|
|
|
- var classes []*Class
|
|
|
- if err := DB().Where("name=?", class.Name).Find(&classes).Error; err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- if len(classes) > 0 {
|
|
|
- return nil, fmt.Errorf("Class %s already exists!", class.Name)
|
|
|
- }
|
|
|
- if err := DB().Create(class).Error; err != nil {
|
|
|
+func SaveClass(class interface{}) (interface{}, error) {
|
|
|
+ if err := DB().Debug().Omit("Coordinator", "Minuter", "Teachers", "Activities", "Students").Save(class).Error; err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
return class, nil
|
|
|
}
|
|
|
|
|
|
-func DeleteClass(args map[string]string, r *http.Request) (IDer, error) {
|
|
|
- class, err := GetClass(args)
|
|
|
- if err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- if err := DB().Unscoped().Delete(class.(*Class)).Error; err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- return class.(*Class), nil
|
|
|
-}
|
|
|
-
|
|
|
func (c *Class) GetTeachers() ([]*Teacher, error) {
|
|
|
if err := DB().Raw(selectUniqueClassTeachers, c.ID).Scan(&c.Teachers).Error; err != nil {
|
|
|
return nil, err
|
|
@@ -218,34 +171,16 @@ func (c *Class) GetActivities() ([]*Activity, error) {
|
|
|
return c.Activities, nil
|
|
|
}
|
|
|
|
|
|
-func GetClassForUpdate(args map[string]string) (interface{}, error) {
|
|
|
- var data ClassForUpdate
|
|
|
-
|
|
|
- id := args["id"]
|
|
|
-
|
|
|
- if err := DB().Preload("Coordinator").Preload("Minuter").First(&data.Class, id).Error; err != nil {
|
|
|
+func CreateClass(class *Class) (*Class, error) {
|
|
|
+ var classes []*Class
|
|
|
+ if err := DB().Where("name=?", class.Name).Find(&classes).Error; err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
-
|
|
|
- if err := DB().Find(&data.AllTeachers).Error; err != nil {
|
|
|
- return nil, err
|
|
|
+ if len(classes) > 0 {
|
|
|
+ return nil, fmt.Errorf("Class %s already exists!", class.Name)
|
|
|
}
|
|
|
-
|
|
|
- data.SelectedMinuter = make(map[uint]string)
|
|
|
- data.SelectedMinuter[data.Class.MinuterID] = "selected"
|
|
|
-
|
|
|
- data.SelectedCoordinator = make(map[uint]string)
|
|
|
- data.SelectedCoordinator[data.Class.CoordinatorID] = "selected"
|
|
|
-
|
|
|
- return data, nil
|
|
|
-}
|
|
|
-
|
|
|
-func GetClassForAdd(args map[string]string) (interface{}, error) {
|
|
|
- var data ClassForAdd
|
|
|
-
|
|
|
- if err := DB().Find(&data.AllTeachers).Error; err != nil {
|
|
|
+ if err := DB().Create(class).Error; err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
-
|
|
|
- return data, nil
|
|
|
+ return class, nil
|
|
|
}
|