cmd/http/main.go

@@ -21,6 +21,7 @@ import (
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 	"git.grassecon.net/urdt/ussd/remote"
+	"git.grassecon.net/urdt/ussd/request"
 )
 
 var (
@@ -123,11 +124,7 @@ func main() {
 
 	rp := &httpserver.DefaultRequestParser{}
 	bsh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
-	// TODO: less hacky way of making session handler
+	sh := request.ToSessionHandler(bsh)
-	//sh := request.ToSessionHandler(bsh)
-	sh := &httpserver.SessionHandler{
-		RequestHandler: bsh,
-	}
 	s := &http.Server{
 		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: sh,

common/storage.go

@@ -57,7 +57,3 @@ func(ss *StorageService) GetUserdataDb(ctx context.Context) (db.Db, error) {
 func(ss *StorageService) GetResource(ctx context.Context) (resource.Resource, error) {
 	return nil, errors.New("not implemented")
 }
-
-func(ss *StorageService) GetStateStore(ctx context.Context) (db.Db, error) {
-	return ss.svc.GetStateStore(ctx)
-}

errors/errors.go

@@ -1,4 +1,4 @@
-package errors
+package common
 
 import (
 	"git.grassecon.net/urdt/ussd/internal/handlers"

internal/http/server_test.go

@@ -98,10 +98,7 @@ func TestSessionHandler_ServeHTTP(t *testing.T) {
 				},
 			}
 
-			sessionHandler := &SessionHandler{
+			sessionHandler := request.ToSessionHandler(mockRequestHandler)
-				RequestHandler: mockRequestHandler,
-			}
-			//sessionHandler := request.ToSessionHandler(mockRequestHandler)
 
 			req := httptest.NewRequest(http.MethodPost, "/", bytes.NewBuffer(tt.input))
 			req.Header.Set("X-Vise-Session", tt.sessionID)

request/request.go

@@ -2,6 +2,7 @@ package request
 
 import (
 	"context"
+	"fmt"
 	"io"
 	"net/http"
 	"strconv"
@@ -58,6 +59,10 @@ func (f *SessionHandler) WriteError(w http.ResponseWriter, code int, err error)
 	}
 }
 
+func (f *SessionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	f.WriteError(w, 500, fmt.Errorf("not implemented"))
+}
+
 func ToSessionHandler(h RequestHandler) *SessionHandler {
 	return &SessionHandler{
 		RequestHandler: h,