Merge pull request #45 from ambrosus/revert-changes

Revert changes

.github/workflows/testing.yml

@@ -30,16 +30,13 @@ jobs:
     needs:
       - build
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
           go-version: 1.19
 
-      - name: Install dependencies
-        run: make deps
+      - name: Checkout code
+        uses: actions/checkout@v3
 
       - name: Run linter
         run: make lint

cmd/main.go

@@ -13,6 +13,7 @@ import (
 	"log"
 	"os/signal"
 	"syscall"
+	"time"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
@@ -56,56 +57,39 @@ func main() {
 	}
 	zapLogger.Info("DB connected successfully")
 
-	//err = migration.RunMigrations(db, cfg.MongoDb.MongoDbName, zapLogger)
-	//if err != nil {
-	//	zapLogger.Fatalf("failed to run migration: %s", err)
-	//}
-
 	// Firebase
 	firebaseClient, err := firebase.NewClient(cfg.Firebase.CredPath)
 	if err != nil {
 		zapLogger.Fatalf("failed to create firebase messaging client - %v", err)
 	}
 
-	zapLogger.Info("Firebase client created successfully")
-
 	cloudMessagingClient, err := firebaseClient.CreateCloudMessagingClient()
 	if err != nil {
 		zapLogger.Fatalf("failed to create firebase cloud messaging client - %v", err)
 	}
 
-	zapLogger.Info("Firebase cloud messaging client created successfully")
-
 	// Firebase message
 	cloudMessagingService, err := cloudmessaging.NewCloudMessagingService(cloudMessagingClient, cfg.Firebase.AndroidChannelName)
 	if err != nil {
 		zapLogger.Fatalf("failed to create firebase message service - %v", err)
 	}
 
-	zapLogger.Info("Firebase message service created successfully")
-
 	// Repository
 	watcherRepository, err := watcher.NewRepository(db, cfg.MongoDb.MongoDbName, zapLogger)
 	if err != nil {
 		zapLogger.Fatalf("failed to create watcher repository - %v", err)
 	}
 
-	zapLogger.Info("Watcher repository created successfully")
-
 	// Services
 	watcherService, err := watcher.NewService(watcherRepository, cloudMessagingService, zapLogger, cfg.ExplorerApi, cfg.TokenPriceUrl, cfg.CallbackUrl, cfg.ExplorerToken)
 	if err != nil {
 		zapLogger.Fatalf("failed to create watcher service - %v", err)
 	}
 
-	zapLogger.Info("Watcher service created successfully")
-
 	if err := watcherService.Init(context.Background()); err != nil {
 		zapLogger.Fatalf("failed to init watchers - %v", err)
 	}
 
-	zapLogger.Info("Watcher service initialized successfully")
-
 	// Handlers
 	healthHandler := health.NewHandler()
 
@@ -114,33 +98,27 @@ func main() {
 		zapLogger.Fatalf("failed to create watcher handler - %v", err)
 	}
 
-	zapLogger.Info("Watcher handler created successfully")
-
 	// Create config variable
 	config := fiber.Config{
 		ServerHeader: "AIRDAO-Mobile-Api", // add custom server header
 	}
 
 	// Run DeleteWatchersWithStaleData on start for check and delete stale data
-	//if err := watcherService.DeleteWatchersWithStaleData(context.Background()); err != nil {
-	//	zapLogger.Errorf("failed to delete watchers with stale data - %v", err)
-	//}
-	//
-	//zapLogger.Info("Deleted watchers with stale data successfully")
-	//
-	//// Run DeleteWatchersWithStaleData every 24 hours for check and delete stale data
-	//go func() {
-	//	for {
-	//		err := watcherService.DeleteWatchersWithStaleData(context.Background())
-	//		if err != nil {
-	//			zapLogger.Errorf("failed to delete watchers with stale data - %v", err)
-	//		}
-	//
-	//		time.Sleep(24 * time.Hour)
-	//	}
-	//}()
-
-	zapLogger.Info("Deleted watchers with stale data every 24 hours successfully")
+	if err := watcherService.DeleteWatchersWithStaleData(context.Background()); err != nil {
+		zapLogger.Errorf("failed to delete watchers with stale data - %v", err)
+	}
+
+	// Run DeleteWatchersWithStaleData every 24 hours for check and delete stale data
+	go func() {
+		for {
+			err := watcherService.DeleteWatchersWithStaleData(context.Background())
+			if err != nil {
+				zapLogger.Errorf("failed to delete watchers with stale data - %v", err)
+			}
+
+			time.Sleep(24 * time.Hour)
+		}
+	}()
 
 	// Create fiber app
 	app := fiber.New(config)
@@ -169,7 +147,6 @@ func main() {
 		if err := app.Listen(":" + cfg.Port); err != nil {
 			zapLogger.Fatal(err)
 		}
-		zapLogger.Info("Server started on port %v", cfg.Port)
 	}()
 
 	zapLogger.Infoln("Server started on port %v", cfg.Port)