From 80346dfd992065737b8f3338cae80dd9b8cdcaef Mon Sep 17 00:00:00 2001
From: DeveloperDurp <DeveloperDurp@durp.info>
Date: Sat, 22 Jun 2024 12:46:16 -0500
Subject: [PATCH] update

---
 {controller => cmd}/controller.go    | 18 +++++++++---------
 go.mod                               |  4 ++--
 main.go                              |  2 +-
 {services => pkg}/dadjoke/handler.go |  0
 {services => pkg}/dadjoke/service.go |  0
 {services => pkg}/health/handler.go  |  0
 {services => pkg}/openai/handler.go  |  0
 {services => pkg}/openai/service.go  |  0
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename {controller => cmd}/controller.go (83%)
 rename {services => pkg}/dadjoke/handler.go (100%)
 rename {services => pkg}/dadjoke/service.go (100%)
 rename {services => pkg}/health/handler.go (100%)
 rename {services => pkg}/openai/handler.go (100%)
 rename {services => pkg}/openai/service.go (100%)

diff --git a/controller/controller.go b/cmd/controller.go
similarity index 83%
rename from controller/controller.go
rename to cmd/controller.go
index a42fe8b..c779d19 100644
--- a/controller/controller.go
+++ b/cmd/controller.go
@@ -12,9 +12,9 @@ import (
 	"gorm.io/gorm"
 
 	"gitlab.com/DeveloperDurp/DurpAPI/middleware"
-	"gitlab.com/DeveloperDurp/DurpAPI/services/dadjoke"
-	"gitlab.com/DeveloperDurp/DurpAPI/services/health"
-	"gitlab.com/DeveloperDurp/DurpAPI/services/openai"
+	"gitlab.com/DeveloperDurp/DurpAPI/pkg/dadjoke"
+	"gitlab.com/DeveloperDurp/DurpAPI/pkg/health"
+	"gitlab.com/DeveloperDurp/DurpAPI/pkg/openai"
 	"gitlab.com/developerdurp/stdmodels"
 )
 
@@ -103,16 +103,16 @@ func (c *Controller) loadAll(router *http.ServeMux) error {
 	router.HandleFunc("/swagger/*", httpSwagger.Handler())
 
 	health, err := health.NewHandler()
-	router.HandleFunc("GET /api/health/gethealth", health.Get)
+	router.HandleFunc("GET /health/gethealth", health.Get)
 
 	dadjoke, err := dadjoke.NewHandler(c.Db)
-	router.HandleFunc("GET /api/jokes/dadjoke", dadjoke.Get)
-	router.HandleFunc("POST /api/jokes/dadjoke", dadjoke.Post)
-	router.HandleFunc("DELETE /api/jokes/dadjoke", dadjoke.Delete)
+	router.HandleFunc("GET /jokes/dadjoke", dadjoke.Get)
+	router.HandleFunc("POST /jokes/dadjoke", dadjoke.Post)
+	router.HandleFunc("DELETE /jokes/dadjoke", dadjoke.Delete)
 
 	openai, err := openai.NewHandler(c.Cfg.LlamaURL)
-	router.HandleFunc("GET /api/openai/general", openai.GeneralOpenAI)
-	router.HandleFunc("GET /api/openai/travelagent", openai.TravelAgentOpenAI)
+	router.HandleFunc("GET /openai/general", openai.GeneralOpenAI)
+	router.HandleFunc("GET /openai/travelagent", openai.TravelAgentOpenAI)
 
 	if err != nil {
 		return err
diff --git a/go.mod b/go.mod
index d7ded80..181d068 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,8 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/swaggo/http-swagger v1.3.4
 	github.com/swaggo/swag v1.16.3
+	gitlab.com/developerdurp/logger v1.0.0
+	gitlab.com/developerdurp/stdmodels v1.0.0
 	gorm.io/driver/postgres v1.5.7
 	gorm.io/gorm v1.25.9
 )
@@ -26,8 +28,6 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/swaggo/files v1.0.1 // indirect
-	gitlab.com/developerdurp/logger v1.0.0 // indirect
-	gitlab.com/developerdurp/stdmodels v1.0.0 // indirect
 	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/net v0.22.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
diff --git a/main.go b/main.go
index 8c71aaa..5cd58f3 100644
--- a/main.go
+++ b/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"gitlab.com/DeveloperDurp/DurpAPI/controller"
+	"gitlab.com/DeveloperDurp/DurpAPI/cmd"
 	"gitlab.com/DeveloperDurp/DurpAPI/docs"
 )
 
diff --git a/services/dadjoke/handler.go b/pkg/dadjoke/handler.go
similarity index 100%
rename from services/dadjoke/handler.go
rename to pkg/dadjoke/handler.go
diff --git a/services/dadjoke/service.go b/pkg/dadjoke/service.go
similarity index 100%
rename from services/dadjoke/service.go
rename to pkg/dadjoke/service.go
diff --git a/services/health/handler.go b/pkg/health/handler.go
similarity index 100%
rename from services/health/handler.go
rename to pkg/health/handler.go
diff --git a/services/openai/handler.go b/pkg/openai/handler.go
similarity index 100%
rename from services/openai/handler.go
rename to pkg/openai/handler.go
diff --git a/services/openai/service.go b/pkg/openai/service.go
similarity index 100%
rename from services/openai/service.go
rename to pkg/openai/service.go