From d4a7732535af8cf68c94af99c4db4f0ca2242d3b Mon Sep 17 00:00:00 2001
From: Colin Henry <jchenry@users.noreply.github.com>
Date: Sat, 22 Aug 2020 16:55:32 -0700
Subject: [PATCH] overhaul of the rest package, made it a little bit more
 testable(WIP) and understandable

---
 rest/collection.go | 44 +++++++++++++++-----------------------------
 rest/gateway.go    | 25 +++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 29 deletions(-)
 create mode 100644 rest/gateway.go

diff --git a/rest/collection.go b/rest/collection.go
index d313365..eadb884 100755
--- a/rest/collection.go
+++ b/rest/collection.go
@@ -10,32 +10,23 @@ import (
 	"github.com/jchenry/x/log"
 )
 
-type CollectionStore interface {
-	All(params map[string][]string) (interface{}, error)
-	Get(id string) (interface{}, error)
-	Delete(id string) error
-	Update(e interface{}) error
-	New(e interface{}) error
-}
-
-// Example: Collection(p, c, JSONEncoder, json.Decode(func()interface{}{return &foo{}}), log.None{})
-func Collection(pool *sync.Pool, store CollectionStore, encode EntityEncoder, decode encoding.Decoder, log log.Logger) http.HandlerFunc {
-	return EntityHandler(
-		collectionGet(store, encode, log),
-		collectionPost(store, encode, decode, pool, log),
-		collectionPut(store, encode, decode, pool, log),
-		collectionDelete(store, encode, log),
+// Example: Resource(p, c, JSONEncoder, json.Decode(func()interface{}{return &foo{}}), log.None{})
+func Resource(p *sync.Pool, g Gateway, e EntityEncoder, d encoding.Decoder, l log.Logger) http.HandlerFunc {
+	return restVerbHandler(
+		GetResource(g, e, l),
+		PostResource(g, d, p, l),
+		PutResource(g, e, d, p, l),
+		DeleteResource(g, l),
 	)
 }
 
-func collectionGet(store CollectionStore, encode EntityEncoder, log log.Logger) http.HandlerFunc {
+func GetResource(store Readable, encode EntityEncoder, log log.Logger) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) { // GET
 		if id := filepath.Base(r.URL.Path); id != "" {
-			if e, err := store.Get(id); err == nil { // handle individual entity
+			if e, err := store.Read(id); err == nil { // handle individual entity
 				encode(w, e)
 			} else {
 				w.WriteHeader(http.StatusInternalServerError)
-				encode(w, err)
 				log.Printf("Error: %s", err)
 			}
 		} else {
@@ -43,25 +34,22 @@ func collectionGet(store CollectionStore, encode EntityEncoder, log log.Logger)
 				if e, err := store.All(params); err == nil { // handle all entities
 					encode(w, e)
 				} else {
-					// TODO: we really should write a header here, but need to figure out what it should be
 					w.WriteHeader(http.StatusInternalServerError)
 					log.Printf("Error: %s", err)
 				}
 			} else {
-				//	encode(w, err)
 				w.WriteHeader(http.StatusBadRequest)
-
 			}
 		}
 	}
 }
 
-func collectionPost(store CollectionStore, encode EntityEncoder, decode encoding.Decoder, pool *sync.Pool, log log.Logger) http.HandlerFunc {
+func PostResource(store Creatable, decode encoding.Decoder, pool *sync.Pool, log log.Logger) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) { // POST TODO
-		e := pool.New()
+		e := pool.Get()
 		defer pool.Put(e)
 		if err := decode(r.Body, e); err == nil {
-			if err = store.New(e); err == nil {
+			if err = store.Create(e); err == nil {
 				w.WriteHeader(http.StatusCreated)
 			} else {
 				w.WriteHeader(http.StatusInternalServerError)
@@ -73,9 +61,9 @@ func collectionPost(store CollectionStore, encode EntityEncoder, decode encoding
 	}
 }
 
-func collectionPut(store CollectionStore, encode EntityEncoder, decode encoding.Decoder, pool *sync.Pool, log log.Logger) http.HandlerFunc {
+func PutResource(store Updatable, encode EntityEncoder, decode encoding.Decoder, pool *sync.Pool, log log.Logger) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) { // PUT TODO
-		e := pool.New()
+		e := pool.Get()
 		defer pool.Put(e)
 		if err := decode(r.Body, e); err == nil {
 			if err = store.Update(e); err == nil {
@@ -87,13 +75,11 @@ func collectionPut(store CollectionStore, encode EntityEncoder, decode encoding.
 			}
 		} else {
 			w.WriteHeader(http.StatusBadRequest)
-			encode(w, err)
-
 		}
 	}
 }
 
-func collectionDelete(store CollectionStore, encode EntityEncoder, log log.Logger) http.HandlerFunc {
+func DeleteResource(store Deletable, log log.Logger) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) { // DELETE TODO
 		if id := filepath.Base(r.URL.Path); id != "" {
 			if err := store.Delete(id); err == nil {
diff --git a/rest/gateway.go b/rest/gateway.go
new file mode 100644
index 0000000..b53207c
--- /dev/null
+++ b/rest/gateway.go
@@ -0,0 +1,25 @@
+package rest
+
+type Creatable interface {
+	Create(e interface{}) error
+}
+
+type Updatable interface {
+	Update(e interface{}) error
+}
+
+type Deletable interface {
+	Delete(id string) error
+}
+
+type Readable interface {
+	All(filters map[string][]string) (interface{}, error)
+	Read(id string) (interface{}, error)
+}
+
+type Gateway interface {
+	Creatable
+	Updatable
+	Deletable
+	Readable
+}