From 48f24d48b547c8aafe447de1d06eebb063036182 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 3 May 2024 12:11:35 +0530
Subject: [PATCH] [server] Move generateAlphaNumString to util

---
 .../pkg/controller/storagebonus/referral.go   | 31 ++-----------------
 server/pkg/utils/random/generate.go           | 27 ++++++++++++++++
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/server/pkg/controller/storagebonus/referral.go b/server/pkg/controller/storagebonus/referral.go
index b452484f41..5bdd951f8d 100644
--- a/server/pkg/controller/storagebonus/referral.go
+++ b/server/pkg/controller/storagebonus/referral.go
@@ -3,7 +3,7 @@ package storagebonus
 import (
 	"database/sql"
 	"errors"
-	"fmt"
+	"github.com/ente-io/museum/pkg/utils/random"
 
 	"github.com/ente-io/museum/ente"
 	entity "github.com/ente-io/museum/ente/storagebonus"
@@ -119,7 +119,7 @@ func (c *Controller) GetOrCreateReferralCode(ctx *gin.Context, userID int64) (*s
 		if !errors.Is(err, sql.ErrNoRows) {
 			return nil, stacktrace.Propagate(err, "failed to get storagebonus code")
 		}
-		code, err := generateAlphaNumString(codeLength)
+		code, err := random.GenerateAlphaNumString(codeLength)
 		if err != nil {
 			return nil, stacktrace.Propagate(err, "")
 		}
@@ -131,30 +131,3 @@ func (c *Controller) GetOrCreateReferralCode(ctx *gin.Context, userID int64) (*s
 	}
 	return referralCode, nil
 }
-
-// generateAlphaNumString returns AlphaNumeric code of given length
-// which exclude number 0 and letter O. The code always starts with an
-// alphabet
-func generateAlphaNumString(length int) (string, error) {
-	// Define the alphabet and numbers to be used in the string.
-	alphabet := "ABCDEFGHIJKLMNPQRSTUVWXYZ"
-	// Define the alphabet and numbers to be used in the string.
-	alphaNum := fmt.Sprintf("%s123456789", alphabet)
-	// Allocate a byte slice with the desired length.
-	result := make([]byte, length)
-	// Generate the first letter as an alphabet.
-	r0, err := auth.GenerateRandomInt(int64(len(alphabet)))
-	if err != nil {
-		return "", stacktrace.Propagate(err, "")
-	}
-	result[0] = alphabet[r0]
-	// Generate the remaining characters as alphanumeric.
-	for i := 1; i < length; i++ {
-		ri, err := auth.GenerateRandomInt(int64(len(alphaNum)))
-		if err != nil {
-			return "", stacktrace.Propagate(err, "")
-		}
-		result[i] = alphaNum[ri]
-	}
-	return string(result), nil
-}
diff --git a/server/pkg/utils/random/generate.go b/server/pkg/utils/random/generate.go
index 47932b6603..75a811c8e1 100644
--- a/server/pkg/utils/random/generate.go
+++ b/server/pkg/utils/random/generate.go
@@ -13,3 +13,30 @@ func GenerateSixDigitOtp() (string, error) {
 	}
 	return fmt.Sprintf("%06d", n), nil
 }
+
+// GenerateAlphaNumString returns AlphaNumeric code of given length
+// which exclude number 0 and letter O. The code always starts with an
+// alphabet
+func GenerateAlphaNumString(length int) (string, error) {
+	// Define the alphabet and numbers to be used in the string.
+	alphabet := "ABCDEFGHIJKLMNPQRSTUVWXYZ"
+	// Define the alphabet and numbers to be used in the string.
+	alphaNum := fmt.Sprintf("%s123456789", alphabet)
+	// Allocate a byte slice with the desired length.
+	result := make([]byte, length)
+	// Generate the first letter as an alphabet.
+	r0, err := auth.GenerateRandomInt(int64(len(alphabet)))
+	if err != nil {
+		return "", stacktrace.Propagate(err, "")
+	}
+	result[0] = alphabet[r0]
+	// Generate the remaining characters as alphanumeric.
+	for i := 1; i < length; i++ {
+		ri, err := auth.GenerateRandomInt(int64(len(alphaNum)))
+		if err != nil {
+			return "", stacktrace.Propagate(err, "")
+		}
+		result[i] = alphaNum[ri]
+	}
+	return string(result), nil
+}