Work in progress

handlers/handlers.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -17,6 +18,17 @@ import (
 	"github.com/gorilla/sessions"
 )
 
+type User struct {
+	Name  string
+	Admin bool
+}
+
+type PathPattern struct {
+	Path         string
+	RedirectPath string
+	Methods      []string
+}
+
 var (
 	signingKey    = []byte("secret")
 	store         = sessions.NewCookieStore([]byte("something-very-secret"))
@@ -29,21 +41,20 @@ var (
 		ErrorHandler:  onError,
 	})
 
-	crud []string = []string{"add", "show", "update", "delete"}
+	patterns []PathPattern = []PathPattern{
+		PathPattern{"/%s", "", []string{"GET"}},
+		PathPattern{"/%s/{id}", "", []string{"GET"}},
+		PathPattern{"/%s/add/", "/%s/%d?format=html&tpl_layout=base&tpl_content=%s_show", []string{"GET", "POST"}},
+		PathPattern{"/%s/{id}/update", "/%s/%d?format=html&tpl_layout=base&tpl_content=%s_show", []string{"GET", "POST"}},
+		PathPattern{"/%s/{id}/delete", "/%s?format=html&tpl_layout=base&tpl_content=%s", []string{"DELETE"}},
+	}
 )
 
-type User struct {
-	Name  string
-	Admin bool
-}
-
 // Generate CRUD handlers
 func generateHandler(r *mux.Router, base string) {
-	r.Handle(fmt.Sprintf("/%s", base), jwtMiddleware.Handler(recoverHandler(generalHandler(base, fmt.Sprintf("/%s", base))))).Methods("GET")
-	r.Handle(fmt.Sprintf("/%s/{id}", base), jwtMiddleware.Handler(recoverHandler(generalHandler(base, fmt.Sprintf("/%s/{id}", base))))).Methods("GET")
-	r.Handle(fmt.Sprintf("/%s/add/", base), jwtMiddleware.Handler(recoverHandler(generalHandler(base, fmt.Sprintf("/%s/add/", base))))).Methods("GET", "POST")
-	r.Handle(fmt.Sprintf("/%s/{id}/update", base), jwtMiddleware.Handler(recoverHandler(generalHandler(base, fmt.Sprintf("/%s/{id}/update", base))))).Methods("GET", "POST")
-	r.Handle(fmt.Sprintf("/%s/{id}/delete", base), jwtMiddleware.Handler(recoverHandler(generalHandler(base, fmt.Sprintf("/%s/{id}/delete", base))))).Methods("POST")
+	for _, pattern := range patterns {
+		r.Handle(fmt.Sprintf(pattern.Path, base), jwtMiddleware.Handler(recoverHandler(modelHandler(base, fmt.Sprintf(pattern.Path, base), pattern.RedirectPath)))).Methods(pattern.Methods...)
+	}
 }
 
 func Handlers() *mux.Router {
@@ -58,7 +69,7 @@ func Handlers() *mux.Router {
 
 	r.Handle("/", jwtMiddleware.Handler(recoverHandler(dashboardHandler())))
 
-	// Generate handlers
+	// Generate model handlers
 
 	for _, model := range []string{"teachers", "activities"} {
 		generateHandler(r, model)
@@ -113,57 +124,79 @@ func recoverHandler(next http.Handler) http.Handler {
 	return http.HandlerFunc(fn)
 }
 
-func generalHandler(base, path string) http.Handler {
+func modelHandler(base, path, redirectPath string) http.Handler {
 	fn := func(w http.ResponseWriter, r *http.Request) {
 		var (
 			ok     bool
 			getFn  orm.GetFn
 			postFn orm.PostFn
 		)
-		if r.Method == "GET" {
+
+		switch r.Method {
+
+		case "GET":
 			getFn, ok = orm.Get[path]
-		} else {
+			if !ok {
+				renderer.Render[r.URL.Query()["format"][0]](w, r, fmt.Errorf("Can't find ORM function for path %s!", path))
+			}
+			data, err := getFn(mux.Vars(r))
+			if err != nil {
+				renderer.Render[r.URL.Query()["format"][0]](w, r, err)
+			} else {
+				renderer.Render[r.URL.Query()["format"][0]](w, r, data, r.URL.Query())
+			}
+
+		case "POST":
 			postFn, ok = orm.Post[path]
-		}
-		if !ok {
-			renderer.Render[r.URL.Query()["format"][0]](w, r, fmt.Errorf("Can't find ORM function for path %s!", path))
-		} else {
-			if r.Method == "GET" {
-				data, err := getFn(mux.Vars(r))
-				if err != nil {
-					renderer.Render[r.URL.Query()["format"][0]](w, r, err)
-				} else {
-					renderer.Render[r.URL.Query()["format"][0]](w, r, data, r.URL.Query())
-				}
+			if !ok {
+				renderer.Render[r.URL.Query()["format"][0]](w, r, fmt.Errorf("Can't find ORM function for path %s!", path))
+			}
+			data, err := postFn(mux.Vars(r), r)
+			if err != nil {
+				renderer.Render["html"](w, r, err)
 			} else {
-				data, err := postFn(mux.Vars(r), r)
-				if err != nil {
-					renderer.Render["html"](w, r, err)
+				if mux.Vars(r)["id"] != "" {
+					http.Redirect(w, r,
+						fmt.Sprintf(
+							"/%s/%s?format=html&tpl_layout=base&tpl_content=%s_show",
+							base,
+							mux.Vars(r)["id"],
+							base,
+						),
+						http.StatusSeeOther,
+					)
 				} else {
-					if mux.Vars(r)["id"] != "" {
-						http.Redirect(w, r,
-							fmt.Sprintf(
-								"/%s/%s?format=html&tpl_layout=base&tpl_content=%s_show",
-								base,
-								mux.Vars(r)["id"],
-								base,
-							),
-							http.StatusSeeOther,
-						)
-					} else {
-						http.Redirect(w, r,
-							fmt.Sprintf(
-								"/%s/%d?format=html&tpl_layout=base&tpl_content=%s_show",
-								base,
-								data.GetID(),
-								base,
-							),
-							http.StatusSeeOther,
-						)
-					}
+					http.Redirect(w, r,
+						fmt.Sprintf(
+							"/%s/%d?format=html&tpl_layout=base&tpl_content=%s_show",
+							base,
+							data.GetID(),
+							base,
+						),
+						http.StatusSeeOther,
+					)
+				}
+
+			}
 
+		case "DELETE":
+			postFn, ok = orm.Post[path]
+			if !ok {
+				renderer.Render[r.URL.Query().Get("format")](w, r, fmt.Errorf("Can't find ORM function for path %s!", path))
+			}
+			_, err := postFn(mux.Vars(r), r)
+			if err != nil {
+				renderer.Render["html"](w, r, err)
+			} else {
+				var data struct {
+					RedirectUrl string `json:"redirect_url"`
 				}
+				data.RedirectUrl = fmt.Sprintf(redirectPath, base, base)
+
+				w.Header().Set("Content-Type", "application/json")
+				json.NewEncoder(w).Encode(data)
 			}
+
 		}
 	}
 

orm/activity.go

@@ -171,22 +171,13 @@ func CreateActivity(activity *Activity) (*Activity, error) {
 	return activity, nil
 }
 
-func DeleteActivity(activity *Activity) error {
-	if err := DB().Delete(activity).Error; err != nil {
-		return err
+func DeleteActivity(args map[string]string, r *http.Request) (IDer, error) {
+	activity, err := GetActivity(args)
+	if err != nil {
+		return nil, err
 	}
-	return nil
+	if err := DB().Unscoped().Delete(activity.(*Activity)).Error; err != nil {
+		return nil, err
+	}
+	return activity.(*Activity), nil
 }
-
-// func (a *Activity) AfterSave(tx *gorm.DB) error {
-// 	var act Activity
-// 	if err := DB().Preload("Teacher").Preload("Subject").Preload("Class").First(&act, a.ID).Error; err != nil {
-// 		return err
-// 	}
-
-// 	log.Println(a.ID)
-// 	if err := tx.Model(a).Update("name", fmt.Sprintf("%s %s %dh", act.Class.Name, act.Subject.Name, act.Hours)).Error; err != nil {
-// 		return err
-// 	}
-// 	return nil
-// }

orm/credential.go

@@ -12,6 +12,7 @@ type Credential struct {
 	Surname         string
 	Username        string
 	Password        string
+	PlainPassword   string
 	Email           string
 	TelephoneNumber string
 }

orm/orm.go

@@ -115,10 +115,12 @@ var (
 	Post map[string]PostFn = map[string]PostFn{
 		// Teacher
 		"/teachers/{id}/update": UpdateTeacher,
+		"/teachers/{id}/delete": DeleteTeacher,
 		"/teachers/add/":        AddTeacher,
 
 		// Activity
 		"/activities/{id}/update": UpdateActivity,
+		"/activities/{id}/delete": DeleteActivity,
 		"/activities/add/":        AddActivity,
 	}
 )

orm/orm_test.go

@@ -1,6 +1,7 @@
 package orm
 
 import (
+	"strconv"
 	"testing"
 	"time"
 
@@ -81,6 +82,35 @@ func (t *testSuite) TestSaveActivity() {
 	}
 }
 
+func (t *testSuite) TestDeleteActivity() {
+	var activities []*Activity
+
+	err := DB().Find(&activities).Error
+	t.Nil(err)
+
+	numActivities := len(activities)
+	activity, err := CreateActivity(
+		&Activity{
+			SubjectID: 1,
+			TeacherID: 1,
+			ClassID:   1,
+		})
+	t.Nil(err)
+
+	err = DB().Find(&activities).Error
+	t.Nil(err)
+
+	t.Equal(numActivities+1, len(activities))
+
+	_, err = DeleteActivity(map[string]string{"id": strconv.Itoa(int(activity.ID))}, nil)
+	t.Nil(err)
+
+	err = DB().Find(&activities).Error
+	t.Nil(err)
+
+	t.Equal(numActivities, len(activities))
+}
+
 func (t *testSuite) TestGetTeacher() {
 	teacher, err := GetTeacher(map[string]string{"id": "1"})
 	t.Nil(err)
@@ -201,17 +231,11 @@ func (t *testSuite) TestSaveTeacher() {
 }
 
 func (t *testSuite) TestCreateDeleteTeacher() {
-	teacher := new(Teacher)
-	teacher.Name = "Giovanni"
-	teacher.Surname = "Giacobbe"
-
-	_, err := CreateTeacher(teacher)
+	teacher, err := CreateTeacher(&Teacher{Credential: Credential{Name: "Giovanni", Surname: "GIACOBBE"}})
 	t.Nil(err)
 
 	if !t.Failed() {
-		teacherFromDb, _ := GetTeacher(map[string]string{"id": "10"})
-		t.Equal("Giovanni", teacherFromDb.(*Teacher).Name)
-		err := DeleteTeacher(teacherFromDb.(*Teacher))
+		_, err = DeleteTeacher(map[string]string{"id": strconv.Itoa(int(teacher.ID))}, nil)
 		t.Nil(err)
 		teachers, _ := GetTeachers(map[string]string{})
 		t.Equal(9, len(teachers.([]*Teacher)))

orm/teacher.go

@@ -47,6 +47,10 @@ func GetNothing(args map[string]string) (interface{}, error) {
 	return nil, nil
 }
 
+func PostNothing(args map[string]string, r *http.Request) (IDer, error) {
+	return nil, nil
+}
+
 func GetTeacher(args map[string]string) (interface{}, error) {
 	var teacher Teacher
 	if err := DB().First(&teacher, args["id"]).Error; err != nil {
@@ -149,11 +153,15 @@ func CreateTeacher(teacher *Teacher) (*Teacher, error) {
 	return teacher, nil
 }
 
-func DeleteTeacher(teacher *Teacher) error {
-	if err := DB().Delete(teacher).Error; err != nil {
-		return err
+func DeleteTeacher(args map[string]string, r *http.Request) (IDer, error) {
+	teacher, err := GetTeacher(args)
+	if err != nil {
+		return nil, err
 	}
-	return nil
+	if err := DB().Unscoped().Delete(teacher.(*Teacher)).Error; err != nil {
+		return nil, err
+	}
+	return teacher.(*Teacher), nil
 }
 
 func (t *Teacher) GetClasses() ([]*Class, error) {

templates/activities.html.tpl

@@ -30,7 +30,7 @@
       <span class="glyphicon glyphicon-briefcase"></span>
       {{$activity.Subject.Name}}
       <div class="text-right">
-	{{if eq $activity.Teacher.ID 0}}
+	{{if not $activity.Teacher}}
 	<small>no docente</small>
 	{{else}}
 	<small>{{$activity.Teacher.Surname}}</small>

templates/activities_show.html.tpl

@@ -3,7 +3,7 @@
 <div class="container">
 
   <ol class="breadcrumb">
-    <li><a href="/activities?{{query "base" "activities"}}">Attività</a></li>
+    <li><a href="/activities?{{query "tpl_layout" "base" "tpl_content" "activities"}}">Attività</a></li>
     <li class="active"><a href="#">{{.Data.Subject.Name}} {{.Data.Class.Name}} {{.Data.Hours}}h</a></li>
   </ol>
 

templates/teachers.html.tpl

@@ -34,12 +34,20 @@
       <span class="glyphicon glyphicon-user"></span>
       {{$teacher.Name}} {{$teacher.Surname}}
       <div class="text-right">
+	{{if $teacher.Classes}}
 	{{range $class := $teacher.Classes}}
 	<small>{{$class.Name}}</small>
 	{{end}}
+	{{else}}
+	<small>no classi</small>
+	{{end}}
+	{{if $teacher.Subjects}}
 	{{range $subject := $teacher.Subjects}}
 	<small>{{$subject.Name}}</small>
 	{{end}}
+	{{else}}
+	<small>no materie</small>
+        {{end}}
       </div>
     </a>
     {{end}}