Merge pull request #137 from Tibz-Dankan/refactor/dir-structure

Refactor/dir structure
Tibz-Dankan · Aug 23, 2024 · fd73409 · fd73409
2 parents 03301a7 + 60531c3
commit fd73409
Show file tree

Hide file tree

Showing 26 changed files with 154 additions and 135 deletions.
diff --git a/.gitkeep b/.gitkeep
@@ -0,0 +1,4 @@
+cmd
+internal
+tests
+Makefile
diff --git a/Makefile b/Makefile
diff --git a/internal/event/subscribers.go b/internal/event/subscribers.go
diff --git a/internal/event/eventBus.go → internal/events/eventBus.go b/internal/event/eventBus.go → internal/events/eventBus.go
@@ -1,4 +1,4 @@
-package event
+package events
 
 import (
 	"log"
@@ -38,12 +38,8 @@ func (eb *EventBus) Subscribe(topic string, ch DataChannel) {
 	eb.rm.Lock()
 	if prev, found := eb.subscribers[topic]; found {
 		eb.subscribers[topic] = append(prev, ch)
-		log.Println("subscribed to channel :::", ch)
-
 	} else {
 		eb.subscribers[topic] = append([]DataChannel{}, ch)
-		log.Println("subscribed to channel :::", ch)
-
 	}
 	eb.rm.Unlock()
 }

diff --git a/internal/events/publishers/publishers.go b/internal/events/publishers/publishers.go
@@ -0,0 +1,7 @@
+package publishers
+
+import "log"
+
+func InitEventPublishers() {
+	log.Println("Initiating global event publishers...")
+}
diff --git a/internal/events/publishers/request.go b/internal/events/publishers/request.go
@@ -0,0 +1,36 @@
+package publishers
+
+import (
+	"log"
+	"sync"
+
+	"github.com/Tibz-Dankan/keep-active/internal/events"
+	"github.com/Tibz-Dankan/keep-active/internal/models"
+)
+
+// Publishes all apps to the topic "makeRequest"
+// for the purposes of making requests to the apps.
+// This function must be called in a scheduler
+func PublishRequestEvent() {
+	app := models.App{}
+
+	apps, err := app.FindAll()
+	if err != nil {
+		log.Println("Error fetching apps:", err)
+		return
+	}
+
+	if len(apps) == 0 {
+		return
+	}
+
+	var wg sync.WaitGroup
+	for _, app := range apps {
+		wg.Add(1)
+		go func(app models.App) {
+			defer wg.Done()
+			events.EB.Publish("makeRequest", app)
+		}(app)
+	}
+	wg.Wait()
+}
diff --git a/internal/event/permissions.go → internal/events/subscribers/permissions.go b/internal/event/permissions.go → internal/events/subscribers/permissions.go
@@ -1,15 +1,16 @@
-package event
+package subscribers
 
 import (
 	"log"
 	"time"
 
+	"github.com/Tibz-Dankan/keep-active/internal/events"
 	"github.com/Tibz-Dankan/keep-active/internal/models"
 )
 
 func subscribeToPermissions() {
-	permissionCh := make(chan DataEvent)
-	EB.Subscribe("permissions", permissionCh)
+	permissionCh := make(chan events.DataEvent)
+	events.EB.Subscribe("permissions", permissionCh)
 
 	permission := models.Permissions{}
 	type User = models.User

diff --git a/internal/events/subscribers/request.go b/internal/events/subscribers/request.go
@@ -0,0 +1,30 @@
+package subscribers
+
+import (
+	"log"
+
+	"github.com/Tibz-Dankan/keep-active/internal/events"
+	"github.com/Tibz-Dankan/keep-active/internal/models"
+	"github.com/Tibz-Dankan/keep-active/internal/routes/request"
+)
+
+// Subscribes/listens to the topic "makeRequest"
+// and performs an http get request to each app
+// whose data has been received.
+func subscribeToRequestEvent() {
+	appCh := make(chan events.DataEvent)
+	events.EB.Subscribe("makeRequest", appCh)
+	type App = models.App
+
+	for {
+		appEvent := <-appCh
+		app, ok := appEvent.Data.(App)
+
+		if !ok {
+			log.Println("Interface does not hold type App")
+			return
+		}
+
+		go request.MakeAppRequest(app)
+	}
+}
diff --git a/internal/events/subscribers/subscribers.go b/internal/events/subscribers/subscribers.go
@@ -0,0 +1,9 @@
+package subscribers
+
+import "log"
+
+func InitEventSubscribers() {
+	log.Println("Initiating global event subscribers...")
+	go subscribeToRequestEvent()
+	subscribeToPermissions()
+}
diff --git a/internal/routes/app/disableApp.go b/internal/routes/app/disableApp.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/Tibz-Dankan/keep-active/internal/event"
 	"github.com/Tibz-Dankan/keep-active/internal/models"
 	"github.com/Tibz-Dankan/keep-active/internal/services"
 	"github.com/gorilla/mux"
@@ -39,8 +38,6 @@ func disableApp(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	event.EB.Publish("updateApp", app)
-
 	response := map[string]interface{}{
 		"status":  "success",
 		"message": "App is disabled successfully",

diff --git a/internal/routes/app/enableApp.go b/internal/routes/app/enableApp.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/Tibz-Dankan/keep-active/internal/event"
 	"github.com/Tibz-Dankan/keep-active/internal/models"
 	"github.com/Tibz-Dankan/keep-active/internal/services"
 	"github.com/gorilla/mux"
@@ -39,8 +38,6 @@ func enableApp(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	event.EB.Publish("updateApp", app)
-
 	response := map[string]interface{}{
 		"status":  "success",
 		"message": "App is enabled successfully",

diff --git a/internal/routes/app/postApp.go b/internal/routes/app/postApp.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/Tibz-Dankan/keep-active/internal/event"
+	"github.com/Tibz-Dankan/keep-active/internal/events"
 	"github.com/Tibz-Dankan/keep-active/internal/middlewares"
 	"github.com/Tibz-Dankan/keep-active/internal/models"
 	"github.com/Tibz-Dankan/keep-active/internal/services"
@@ -70,7 +70,7 @@ func PostAdd(w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(response)
 
 	user := models.User{ID: userID}
-	event.EB.Publish("permissions", user)
+	events.EB.Publish("permissions", user)
 }
 
 func PostAppRoute(router *mux.Router) {

diff --git a/internal/routes/app/updateApp.go b/internal/routes/app/updateApp.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/Tibz-Dankan/keep-active/internal/event"
 	"github.com/Tibz-Dankan/keep-active/internal/models"
 	"github.com/Tibz-Dankan/keep-active/internal/services"
 	"github.com/gorilla/mux"
@@ -72,8 +71,6 @@ func updateApp(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	event.EB.Publish("updateApp", app)
-
 	response := map[string]interface{}{
 		"status":  "success",
 		"message": "Updated successfully",

diff --git a/internal/routes/auth/resetPassword.go b/internal/routes/auth/resetPassword.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/Tibz-Dankan/keep-active/internal/event"
+	"github.com/Tibz-Dankan/keep-active/internal/events"
 	"github.com/Tibz-Dankan/keep-active/internal/models"
 	"github.com/Tibz-Dankan/keep-active/internal/services"
 	"github.com/gorilla/mux"
@@ -68,7 +68,7 @@ func resetPassword(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 	json.NewEncoder(w).Encode(response)
 
-	event.EB.Publish("permissions", user)
+	events.EB.Publish("permissions", user)
 }
 
 func ResetPasswordRoute(router *mux.Router) {

diff --git a/internal/routes/auth/signin.go b/internal/routes/auth/signin.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/Tibz-Dankan/keep-active/internal/event"
+	"github.com/Tibz-Dankan/keep-active/internal/events"
 	"github.com/Tibz-Dankan/keep-active/internal/models"
 	"github.com/Tibz-Dankan/keep-active/internal/services"
 	"github.com/gorilla/mux"
@@ -67,7 +67,7 @@ func signIn(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 	json.NewEncoder(w).Encode(response)
 
-	event.EB.Publish("permissions", user)
+	events.EB.Publish("permissions", user)
 }
 
 func SignInRoute(router *mux.Router) {

diff --git a/internal/routes/auth/signup.go b/internal/routes/auth/signup.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/Tibz-Dankan/keep-active/internal/event"
+	"github.com/Tibz-Dankan/keep-active/internal/events"
 	"github.com/Tibz-Dankan/keep-active/internal/models"
 	"github.com/Tibz-Dankan/keep-active/internal/services"
 	"github.com/gorilla/mux"
@@ -73,7 +73,7 @@ func signUp(w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(response)
 
 	user.ID = userId
-	event.EB.Publish("permissions", user)
+	events.EB.Publish("permissions", user)
 }
 
 func SignUpRoute(router *mux.Router) {

diff --git a/internal/routes/feedback/postFeedback.go b/internal/routes/feedback/postFeedback.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/Tibz-Dankan/keep-active/internal/event"
+	"github.com/Tibz-Dankan/keep-active/internal/events"
 	"github.com/Tibz-Dankan/keep-active/internal/middlewares"
 	"github.com/Tibz-Dankan/keep-active/internal/models"
 	"github.com/Tibz-Dankan/keep-active/internal/services"
@@ -48,7 +48,7 @@ func postFeedback(w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(response)
 
 	user := models.User{ID: userId}
-	event.EB.Publish("permissions", user)
+	events.EB.Publish("permissions", user)
 }
 
 func PostFeedbackRoute(router *mux.Router) {

diff --git a/internal/routes/request/deleteRequestTime.go b/internal/routes/request/deleteRequestTime.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/Tibz-Dankan/keep-active/internal/event"
 	"github.com/Tibz-Dankan/keep-active/internal/models"
 	"github.com/Tibz-Dankan/keep-active/internal/services"
 	"github.com/gorilla/mux"
@@ -40,8 +39,6 @@ func deleteRequestTime(w http.ResponseWriter, r *http.Request) {
 		"status":  "success",
 		"message": "Request Time deleted successfully",
 	}
-	app := models.App{ID: savedRequestTime.AppID}
-	event.EB.Publish("updateApp", app)
 
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)

diff --git a/internal/routes/request/getLiveRequests.go b/internal/routes/request/getLiveRequests.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/Tibz-Dankan/keep-active/internal/event"
+	"github.com/Tibz-Dankan/keep-active/internal/events"
 	"github.com/Tibz-Dankan/keep-active/internal/middlewares"
 	"github.com/Tibz-Dankan/keep-active/internal/services"
 	"github.com/gorilla/mux"
@@ -90,8 +90,8 @@ func getLiveRequests(w http.ResponseWriter, r *http.Request) {
 	}
 
 	type AppRequestProgress = services.AppRequestProgress
-	appCh := make(chan event.DataEvent)
-	event.EB.Subscribe("appRequestProgress", appCh)
+	appCh := make(chan events.DataEvent)
+	events.EB.Subscribe("appRequestProgress", appCh)
 
 	heartbeatTicker := time.NewTicker(30 * time.Second)
 
@@ -120,7 +120,7 @@ func getLiveRequests(w http.ResponseWriter, r *http.Request) {
 			}
 		case <-disconnect:
 			clientManager.RemoveClient(userId)
-			event.EB.Unsubscribe("appRequestProgress", appCh)
+			events.EB.Unsubscribe("appRequestProgress", appCh)
 			heartbeatTicker.Stop()
 			cancel()
 			log.Println("Client disconnected:", userId)