multiple improvements

2021-01-30 06:53:34 -03:00
parent 517aa43668
commit fa16e16e9b
19 changed files with 993 additions and 403 deletions
@@ -1,63 +0,0 @@
-package goapi
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"strings"
-)
-
-type API struct {
-	Mux   *http.ServeMux
-	Perms map[string]string
-}
-
-func (a *API) GetPerm(r *http.Request) string {
-	return a.Perms[r.Method+"_"+strings.Split(r.RequestURI, "?")[0]]
-}
-
-func Init() API {
-	mux := &http.ServeMux{}
-
-	ret := API{
-		Mux:   mux,
-		Perms: make(map[string]string),
-	}
-
-	mux.HandleFunc("/someapi", func(w http.ResponseWriter, r *http.Request) {
-		switch r.Method {
-		case "POST":
-			h_SomeAPI2(w, r)
-		default:
-			http.Error(w, "Method not allowed", 500)
-		}
-	})
-	return ret
-}
-
-func h_SomeAPI2(w http.ResponseWriter, r *http.Request) {
-
-	ctx := r.Context()
-	ctx = context.WithValue(r.Context(), "REQ", r)
-	ctx = context.WithValue(ctx, "RES", w)
-	req := &AStr{}
-	if r.Method != http.MethodGet && r.Method != http.MethodHead {
-		err := json.NewDecoder(r.Body).Decode(&req)
-		if err != nil {
-			http.Error(w, err.Error(), 500)
-			return
-		}
-	}
-
-	res, err := SomeAPI2(ctx, req)
-	if err != nil {
-		http.Error(w, err.Error(), 500)
-		return
-	}
-	w.Header().Add("Content-Type", "Application/json")
-	err = json.NewEncoder(w).Encode(res)
-	if err != nil {
-		http.Error(w, err.Error(), 500)
-		return
-	}
-}
@@ -0,0 +1,127 @@
+package goapi
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"strings"
+)
+
+type API struct {
+	Mux   *http.ServeMux
+	Perms map[string]string
+}
+
+func (a *API) GetPerm(r *http.Request) string {
+	return a.Perms[r.Method+"_"+strings.Split(r.RequestURI, "?")[0]]
+}
+
+func Init() API {
+	mux := &http.ServeMux{}
+
+	ret := API{
+		Mux:   mux,
+		Perms: make(map[string]string),
+	}
+
+	mux.HandleFunc("/someapi", func(w http.ResponseWriter, r *http.Request) {
+		switch r.Method {
+		case "POST":
+			h_SomeAPI2(w, r)
+		case "PUT":
+			h_SomeAPI(w, r)
+		default:
+			http.Error(w, "Method not allowed", 500)
+		}
+	})
+	mux.HandleFunc("/someapi3", func(w http.ResponseWriter, r *http.Request) {
+		switch r.Method {
+		case "POST":
+			h_SomeAPI3(w, r)
+		default:
+			http.Error(w, "Method not allowed", 500)
+		}
+	})
+	return ret
+}
+
+func h_SomeAPI(w http.ResponseWriter, r *http.Request) {
+
+	ctx := r.Context()
+	ctx = context.WithValue(r.Context(), "REQ", r)
+	ctx = context.WithValue(ctx, "RES", w)
+	req := &Noop{}
+	if r.Method != http.MethodGet && r.Method != http.MethodHead {
+		err := json.NewDecoder(r.Body).Decode(&req)
+		if err != nil {
+			http.Error(w, err.Error(), 500)
+			return
+		}
+	}
+
+	res, err := SomeAPI(ctx, req)
+	if err != nil {
+		http.Error(w, err.Error(), 500)
+		return
+	}
+	w.Header().Add("Content-Type", "Application/json")
+	err = json.NewEncoder(w).Encode(res)
+	if err != nil {
+		http.Error(w, err.Error(), 500)
+		return
+	}
+}
+
+func h_SomeAPI2(w http.ResponseWriter, r *http.Request) {
+
+	ctx := r.Context()
+	ctx = context.WithValue(r.Context(), "REQ", r)
+	ctx = context.WithValue(ctx, "RES", w)
+	req := &AStr2{}
+	if r.Method != http.MethodGet && r.Method != http.MethodHead {
+		err := json.NewDecoder(r.Body).Decode(&req)
+		if err != nil {
+			http.Error(w, err.Error(), 500)
+			return
+		}
+	}
+
+	res, err := SomeAPI2(ctx, req)
+	if err != nil {
+		http.Error(w, err.Error(), 500)
+		return
+	}
+	w.Header().Add("Content-Type", "Application/json")
+	err = json.NewEncoder(w).Encode(res)
+	if err != nil {
+		http.Error(w, err.Error(), 500)
+		return
+	}
+}
+
+func h_SomeAPI3(w http.ResponseWriter, r *http.Request) {
+
+	ctx := r.Context()
+	ctx = context.WithValue(r.Context(), "REQ", r)
+	ctx = context.WithValue(ctx, "RES", w)
+	req := &AStr{}
+	if r.Method != http.MethodGet && r.Method != http.MethodHead {
+		err := json.NewDecoder(r.Body).Decode(&req)
+		if err != nil {
+			http.Error(w, err.Error(), 500)
+			return
+		}
+	}
+
+	res, err := SomeAPI3(ctx, req)
+	if err != nil {
+		http.Error(w, err.Error(), 500)
+		return
+	}
+	w.Header().Add("Content-Type", "Application/json")
+	err = json.NewEncoder(w).Encode(res)
+	if err != nil {
+		http.Error(w, err.Error(), 500)
+		return
+	}
+}
@@ -2,42 +2,68 @@ package goapi

 import (
 	"context"
+	"time"
 )

 //
-///*@API*/
-//type ARequestStruct struct {
-//	A *string `json:"a"`
-//	B int64
-//	C time.Time
-//	D *string
-//}
-//
-///*@API*/
-//type AResponseStruct struct {
-//	A string
-//	B int64
-//	C time.Time
-//	D *string
-//}
-//
-///*
-//@API
-//@PATH: /someapi
-//*/
-//func SomeAPI(ctx context.Context, a *ARequestStruct) (*AResponseStruct, error) {
-//	return nil, nil
-//}
+/*@API*/
+type ARequestStruct struct {
+	A *string `json:"SUPERCALIFRAGILISPEALIDOUX"`
+	B int64   `json:"bcd"`
+	C time.Time
+	D *string
+}
+
+/*@API*/
+type AResponseStruct struct {
+	A string
+	B int64
+	C time.Time
+	D *string
+}

 /*@API*/
 type AStr struct {
-	A string
+	Country       string
+	City          string
+	HouseNumber   int64
+	IsCondo       bool
+	SomeWeirdTest string `json:"SUPERCALIFRAGILISPEALIDOUX"`
+}
+
+/*@API*/
+type AStr2 struct {
+	Firstname string `json:"firstname"`
+	Lastname  string `json:"lastname"`
+	Products  []string
+	Addresses map[string]AStr
+}
+
+/*@API*/
+type Noop struct{}
+
+/*
+@API
+@PATH: /someapi
+@PERM: ASD
+@VERB: PUT
+*/
+func SomeAPI(ctx context.Context, a *Noop) ([]*AStr, error) {
+	return nil, nil
 }

 /*
@API
@PATH: /someapi
 */
-func SomeAPI2(ctx context.Context, a *AStr) ([]*AStr, error) {
+func SomeAPI2(ctx context.Context, a *AStr2) ([]*AStr, error) {
+	return nil, nil
+}
+
+/*
+@API
+@PATH: /someapi3
+*/
+func SomeAPI3(ctx context.Context, a *AStr) ([]*AStr, error) {
 	return nil, nil
 }