🎨 Update project structure

pkg/internal/grpc/attachments.go

@@ -3,10 +3,10 @@ package grpc
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/proto"
 	"google.golang.org/protobuf/types/known/emptypb"
 
-	"git.solsynth.dev/hydrogen/paperclip/pkg/database"
-	"git.solsynth.dev/hydrogen/paperclip/pkg/grpc/proto"
 	"git.solsynth.dev/hydrogen/paperclip/pkg/models"
 	jsoniter "github.com/json-iterator/go"
 )

pkg/internal/grpc/server.go

@@ -1,9 +1,9 @@
 package grpc
 
 import (
+	"git.solsynth.dev/hydrogen/paperclip/pkg/proto"
 	"net"
 
-	"git.solsynth.dev/hydrogen/paperclip/pkg/grpc/proto"
 	"github.com/spf13/viper"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"

pkg/internal/server/attachments_api.go

@@ -3,13 +3,13 @@ package server
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/grpc"
 	"net/url"
 	"path/filepath"
 
-	"git.solsynth.dev/hydrogen/paperclip/pkg/grpc"
 	"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
 
-	"git.solsynth.dev/hydrogen/paperclip/pkg/database"
 	"git.solsynth.dev/hydrogen/paperclip/pkg/models"
 	"git.solsynth.dev/hydrogen/paperclip/pkg/services"
 	"github.com/gofiber/fiber/v2"

pkg/internal/services/attachments.go

@@ -2,12 +2,12 @@ package services
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
 	"mime"
 	"mime/multipart"
 	"net/http"
 	"path/filepath"
 
-	"git.solsynth.dev/hydrogen/paperclip/pkg/database"
 	"git.solsynth.dev/hydrogen/paperclip/pkg/models"
 	"github.com/google/uuid"
 	"gorm.io/gorm"

pkg/internal/services/auth.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/grpc"
 	"reflect"
 	"time"
 
-	"git.solsynth.dev/hydrogen/paperclip/pkg/database"
-	"git.solsynth.dev/hydrogen/paperclip/pkg/grpc"
 	"git.solsynth.dev/hydrogen/paperclip/pkg/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
 	"gorm.io/gorm"

pkg/internal/services/cleaner.go

@@ -1,9 +1,9 @@
 package services
 
 import (
+	database2 "git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
 	"time"
 
-	"git.solsynth.dev/hydrogen/paperclip/pkg/database"
 	"github.com/rs/zerolog/log"
 )
 
@@ -12,8 +12,8 @@ func DoAutoDatabaseCleanup() {
 	log.Debug().Time("deadline", deadline).Msg("Now cleaning up entire database...")
 
 	var count int64
-	for _, model := range database.AutoMaintainRange {
-		tx := database.C.Unscoped().Delete(model, "deleted_at >= ?", deadline)
+	for _, model := range database2.AutoMaintainRange {
+		tx := database2.C.Unscoped().Delete(model, "deleted_at >= ?", deadline)
 		if tx.Error != nil {
 			log.Error().Err(tx.Error).Msg("An error occurred when running auth context cleanup...")
 		}

pkg/main.go

@@ -1,17 +1,17 @@
 package main
 
 import (
+	database2 "git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
+	grpc2 "git.solsynth.dev/hydrogen/paperclip/pkg/internal/grpc"
 	"os"
 	"os/signal"
 	"syscall"
 
-	"git.solsynth.dev/hydrogen/paperclip/pkg/grpc"
-	"git.solsynth.dev/hydrogen/paperclip/pkg/server"
-	"git.solsynth.dev/hydrogen/paperclip/pkg/services"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/server"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/services"
 	"github.com/robfig/cron/v3"
 
-	paperclip "git.solsynth.dev/hydrogen/paperclip/pkg"
-	"git.solsynth.dev/hydrogen/paperclip/pkg/database"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/internal"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
@@ -35,14 +35,14 @@ func main() {
 	}
 
 	// Connect to database
-	if err := database.NewSource(); err != nil {
+	if err := database2.NewSource(); err != nil {
 		log.Fatal().Err(err).Msg("An error occurred when connect to database.")
-	} else if err := database.RunMigration(database.C); err != nil {
+	} else if err := database2.RunMigration(database2.C); err != nil {
 		log.Fatal().Err(err).Msg("An error occurred when running database auto migration.")
 	}
 
 	// Connect other services
-	if err := grpc.ConnectPassport(); err != nil {
+	if err := grpc2.ConnectPassport(); err != nil {
 		log.Fatal().Err(err).Msg("An error occurred when connecting to passport grpc endpoint...")
 	}
 
@@ -57,19 +57,19 @@ func main() {
 
 	// Grpc Server
 	go func() {
-		if err := grpc.StartGrpc(); err != nil {
+		if err := grpc2.StartGrpc(); err != nil {
 			log.Fatal().Err(err).Msg("An message occurred when starting grpc server.")
 		}
 	}()
 
 	// Messages
-	log.Info().Msgf("Paperclip v%s is started...", paperclip.AppVersion)
+	log.Info().Msgf("Paperclip v%s is started...", pkg.AppVersion)
 
 	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
 	<-quit
 
-	log.Info().Msgf("Paperclip v%s is quitting...", paperclip.AppVersion)
+	log.Info().Msgf("Paperclip v%s is quitting...", pkg.AppVersion)
 
 	quartz.Stop()
 }