rename postgr fucntions

packages/http/connectionsAndDms.go

@@ -76,7 +76,7 @@ func HandleDm(response http.ResponseWriter, request *http.Request) {
 		Event: message,
 	})
 
-	err = postgresql.PgConnectionMessageSave(ctx, message)
+	err = postgresql.ConnectionMessageSave(ctx, message)
 	if err != nil {
 		http.Error(response, "internal server error", http.StatusInternalServerError)
 		return
@@ -139,7 +139,7 @@ func HandleUserGetConnectionMessages(response http.ResponseWriter, request *http
 		if validBufCount > 0 {
 			cutoff = buffer[0].CreatedAt
 		}
-		dbMessages, err := postgresql.PgConnectionGetMessagesBefore(ctx, cutoff, connectionId, remaining)
+		dbMessages, err := postgresql.ConnectionGetMessagesBefore(ctx, cutoff, connectionId, remaining)
 		if err != nil {
 			http.Error(response, "internal server error", http.StatusInternalServerError)
 			return
@@ -204,7 +204,7 @@ func HandleUserNewConnection(response http.ResponseWriter, request *http.Request
 		RecipientId: recipient.Id,
 		State:       ConnectionState.Stranger,
 	}
-	err = postgresql.PgConnectionSave(ctx, connection)
+	err = postgresql.ConnectionSave(ctx, connection)
 	if err != nil {
 		http.Error(response, "internal server error", http.StatusInternalServerError)
 		return
@@ -264,7 +264,7 @@ func HandleUserDeleteConnection(response http.ResponseWriter, request *http.Requ
 		return
 	}
 
-	err = postgresql.PgConnectionDelete(ctx, conn)
+	err = postgresql.ConnectionDelete(ctx, conn)
 	if err != nil {
 		http.Error(response, "internal server error", http.StatusInternalServerError)
 		return
@@ -315,7 +315,7 @@ func HandleUserElevateConnection(response http.ResponseWriter, request *http.Req
 			return
 		}
 
-		err = postgresql.PgConnectionUpdateState(ctx, conn)
+		err = postgresql.ConnectionUpdateState(ctx, conn)
 		if err != nil {
 			http.Error(response, "internal server error", http.StatusInternalServerError)
 			return

packages/http/file.go

@@ -5,12 +5,15 @@ import (
 	"go-socket/packages/convertions"
 	"go-socket/packages/globals"
 	"go-socket/packages/minio"
+	"go-socket/packages/postgresql"
 	"io"
 	"net/http"
+
+	"github.com/google/uuid"
 )
 
 func handleExistingUpload() {
-	
+
 }
 
 func HandleFileUpload(response http.ResponseWriter, request *http.Request) {
@@ -71,11 +74,17 @@ func HandleFileUpload(response http.ResponseWriter, request *http.Request) {
 		if minio.DoesExist(ctx, key) {
 			part.Close()
 			uploaded = true
+			handleExistingUpload()
 			continue
 		}
 
-		err = minio.Upload(ctx, key, part, -1, contentType, user.Id)
+		id := uuid.New()
+		err = minio.Upload(ctx, key, part, -1, contentType, id)
+
+		postgresql.FileMetadataSave()
+
 		part.Close()
+
 		if err != nil {
 			http.Error(response, "upload failed", http.StatusInternalServerError)
 			return

packages/http/get.go

@@ -15,7 +15,7 @@ func getUserById(ctx context.Context, userId uuid.UUID) (*types.User, error) {
 	user, err := cache.CacheGetUserById(userId)
 	if err != nil {
 		user = &types.User{Id: userId}
-		err = postgresql.PgGetWholeUser(ctx, user)
+		err = postgresql.GetWholeUser(ctx, user)
 		if err != nil {
 			return nil, err
 		}

packages/http/user.go

@@ -42,11 +42,11 @@ func HandleUserNewToken(response http.ResponseWriter, request *http.Request) {
 	user, err = cache.CacheGetUserByName(username)
 	if err != nil {
 		user = &types.User{Name: username}
-		if err = postgresql.PgUserGetStandardInfoByName(ctx, user); err != nil {
+		if err = postgresql.UserGetStandardInfoByName(ctx, user); err != nil {
 			http.Error(response, "bad login", http.StatusUnauthorized)
 			return
 		}
-		if err = postgresql.PgGetWholeUser(ctx, user); err != nil {
+		if err = postgresql.GetWholeUser(ctx, user); err != nil {
 			http.Error(response, err.Error(), http.StatusInternalServerError)
 			return
 		}
@@ -106,7 +106,7 @@ func HandleUserNew(response http.ResponseWriter, request *http.Request) {
 
 	ctx := request.Context()
 
-	err = postgresql.PgUserSave(ctx, newUser)
+	err = postgresql.UserSave(ctx, newUser)
 	if err != nil {
 		http.Error(response, "name taken", http.StatusUnauthorized)
 		return
@@ -127,7 +127,7 @@ func HandleUserDelete(response http.ResponseWriter, request *http.Request) {
 		return
 	}
 
-	err = postgresql.PgUserDelete(ctx, userId)
+	err = postgresql.UserDelete(ctx, userId)
 	if err != nil {
 		http.Error(response, "internal server error", http.StatusInternalServerError)
 		return
@@ -156,7 +156,7 @@ func HandleUserModifyAppearance(response http.ResponseWriter, request *http.Requ
 		return
 	}
 	user.Color = color
-	err = postgresql.PgUserSetColor(ctx, user)
+	err = postgresql.UserSetColor(ctx, user)
 	if err != nil {
 		http.Error(response, "internal server error", http.StatusInternalServerError)
 		return
@@ -184,7 +184,7 @@ func HandleUserModifyAbout(response http.ResponseWriter, request *http.Request)
 	}
 
 	user.Pronouns = pronouns
-	err = postgresql.PgUserSetPronouns(ctx, user)
+	err = postgresql.UserSetPronouns(ctx, user)
 	if err != nil {
 		http.Error(response, "internal server error", http.StatusInternalServerError)
 		return