Updating to receive extended Github user details

Minor fix: trimming username from request

Author: rajatasusual

internals/github-service.go

@@ -13,7 +13,6 @@ import (
 func fetchGitHubProfile(username, token string) (*views.GitHubUser, error) {
 	ctx := context.Background()
 
-	// Set up GitHub client with authentication if a token is provided
 	var client *github.Client
 	if token != "" {
 		ts := oauth2.StaticTokenSource(
@@ -25,7 +24,6 @@ func fetchGitHubProfile(username, token string) (*views.GitHubUser, error) {
 		client = github.NewClient(nil)
 	}
 
-	// Fetch the user details
 	user, _, err := client.Users.Get(ctx, username)
 	if err != nil {
 		if rateLimitErr, ok := err.(*github.RateLimitError); ok {
@@ -34,11 +32,18 @@ func fetchGitHubProfile(username, token string) (*views.GitHubUser, error) {
 		return nil, err
 	}
 
-	// Map the GitHub API response to our GitHubUser struct
 	return &views.GitHubUser{
-		Login:     user.GetLogin(),
-		Name:      user.GetName(),
-		AvatarURL: user.GetAvatarURL(),
-		Bio:       user.GetBio(),
+		Login:       user.GetLogin(),
+		Name:        user.GetName(),
+		AvatarURL:   user.GetAvatarURL(),
+		Bio:         user.GetBio(),
+		Company:     user.GetCompany(),
+		Blog:        user.GetBlog(),
+		Location:    user.GetLocation(),
+		Email:       user.GetEmail(),
+		PublicRepos: user.GetPublicRepos(),
+		Followers:   user.GetFollowers(),
+		Following:   user.GetFollowing(),
+		CreatedAt:   user.GetCreatedAt().Format("2006-01-02"),
 	}, nil
 }

internals/handlers.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"go-github/views"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/a-h/templ"
@@ -21,6 +22,7 @@ func render(ctx *gin.Context, status int, template templ.Component) error {
 func getUserHandler(ctx *gin.Context) {
 	_, cancel := context.WithTimeout(context.Background(), appTimeout)
 	username := ctx.Query("username")
+	username = strings.TrimSpace(username)
 
 	if username == "" {
 		username = "rajatasusual"

internals/xata-service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"go-github/views"
+	"reflect"
 
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/xataio/xata-go/xata"
@@ -14,6 +15,19 @@ var xataURL = GetEnvVariable("XATA_DATABASE_URL")
 var databaseName = GetEnvVariable("XATA_DATABASE_NAME")
 var tableName = GetEnvVariable("XATA_TABLE_NAME")
 
+// toXataValue is a helper function to convert interface{} to *xata.DataInputRecordValue
+func toXataValue(value interface{}) *xata.DataInputRecordValue {
+	switch v := value.(type) {
+	case string:
+		return xata.ValueFromString(v)
+	case int:
+		return xata.ValueFromInteger(v)
+	// Add cases for other types if needed
+	default:
+		return nil
+	}
+}
+
 func createNewEntry(inputGitHubUser *views.GitHubUser) (id string, err error) {
 
 	ctx := context.Background()
@@ -51,7 +65,7 @@ func FetchProfileFromXata(id string) (*views.GitHubUser, error) {
 		return nil, fmt.Errorf("failed to create records client: %v", err)
 	}
 
-	// retrieve the record
+	// Retrieve the record
 	getRecordRequest := xata.GetRecordRequest{
 		RecordRequest: xata.RecordRequest{
 			DatabaseName: xata.String(databaseName),
@@ -60,7 +74,6 @@ func FetchProfileFromXata(id string) (*views.GitHubUser, error) {
 		RecordID: id,
 	}
 	recordRetrieved, err := recordsCli.Get(ctx, getRecordRequest)
-
 	if err != nil {
 		return nil, fmt.Errorf("failed to get record: %v", err)
 	}
@@ -69,13 +82,34 @@ func FetchProfileFromXata(id string) (*views.GitHubUser, error) {
 		return nil, nil
 	}
 
-	return &views.GitHubUser{
-		Login:     recordRetrieved.Data["Login"].(string),
-		Name:      recordRetrieved.Data["Name"].(string),
-		AvatarURL: recordRetrieved.Data["AvatarURL"].(string),
-		Bio:       recordRetrieved.Data["Bio"].(string),
-	}, nil
+	// Create an empty GitHubUser instance
+	user := &views.GitHubUser{}
+	userValue := reflect.ValueOf(user).Elem()
+	userType := userValue.Type()
+
+	// Populate struct fields dynamically
+	for i := 0; i < userType.NumField(); i++ {
+		field := userType.Field(i)
+		fieldValue := userValue.Field(i)
+
+		// Get the data from recordRetrieved.Data map based on the field name
+		if val, ok := recordRetrieved.Data[field.Name]; ok {
+			// Type-assert and set the field value dynamically
+
+			if fieldValue.CanSet() {
+				switch v := val.(type) {
+				case string:
+					fieldValue.SetString(v)
+				case int:
+				case float64:
+					fieldValue.SetInt(int64(v))
+					// Add cases for other types if needed, e.g., bool, float, etc.
+				}
+			}
+		}
+	}
 
+	return user, nil
 }
 
 func FetchAllUsers() ([]*views.GitHubUser, error) {
@@ -113,17 +147,26 @@ func FetchAllUsers() ([]*views.GitHubUser, error) {
 }
 
 func generateInsertRecordRequest(databaseName, tableName string, inputGitHubUser *views.GitHubUser) xata.InsertRecordWithIDRequest {
+	body := make(map[string]*xata.DataInputRecordValue)
+
+	// Use reflection to iterate over fields in GitHubUser struct
+	userType := reflect.TypeOf(*inputGitHubUser)
+	userValue := reflect.ValueOf(*inputGitHubUser)
+
+	for i := 0; i < userType.NumField(); i++ {
+		field := userType.Field(i)
+		fieldValue := userValue.Field(i).Interface()
+
+		// Convert the field value to *xata.DataInputRecordValue
+		body[field.Name] = toXataValue(fieldValue)
+	}
+
 	return xata.InsertRecordWithIDRequest{
 		RecordRequest: xata.RecordRequest{
 			TableName:    tableName,
 			DatabaseName: &databaseName,
 		},
 		RecordID: inputGitHubUser.Login,
-		Body: map[string]*xata.DataInputRecordValue{
-			"Login":     xata.ValueFromString(inputGitHubUser.Login),
-			"Name":      xata.ValueFromString(inputGitHubUser.Name),
-			"AvatarURL": xata.ValueFromString(inputGitHubUser.AvatarURL),
-			"Bio":       xata.ValueFromString(inputGitHubUser.Bio),
-		},
+		Body:     body,
 	}
 }

views/index.templ

@@ -1,12 +1,22 @@
 package views
 
 import "go-github/views/components"
-// GitHubUser represents a GitHub user
+import "fmt"
+
+// GitHubUser represents a GitHub user with extended details
 type GitHubUser struct {
-	Login     string
-	Name      string
-	AvatarURL string
-	Bio       string
+	Login           string
+	Name            string
+	AvatarURL       string
+	Bio             string
+	Company         string
+	Blog            string
+	Location        string
+	Email           string
+	PublicRepos     int
+	Followers       int
+	Following       int
+	CreatedAt       string
 }
 
 templ Index(user *GitHubUser) {
@@ -21,51 +31,44 @@ templ Index(user *GitHubUser) {
 					</h3>
 				</nav>
 				<div class="mt-6 w-full flex justify-center items-center flex-col">
-					// FORM PROCESSING
-					<form
-						method="get"
-						onsubmit="submit()"
-						class="w-96"
-					>
+					<!-- Search Form -->
+					<form method="get" class="w-96">
 						<input
 							type="text"
 							name="username"
-							cols="30"
-							rows="2"
 							class="w-full border rounded-lg mb-2 p-4"
 							placeholder="Input username"
 							id="username"
-
 							value={user.Login}
-
 							autocomplete="off"
-							autofocus
 							required
 						/>
-						<button
-							class="py-1 px-4 w-full h-10 rounded-lg text-white bg-zinc-800"
-						>
+						<button class="py-1 px-4 w-full h-10 rounded-lg text-white bg-zinc-800">
 							Search
 						</button>
 					</form>
 					<br>
-					<!-- RESULT PROCESSING -->
+
+					<!-- Profile Information -->
 					<div class="w-full flex justify-center items-center flex-col">
-						<img
-							class="w-24 h-24 rounded-full"
-							src={user.AvatarURL}
-						/>
+						<img class="w-24 h-24 rounded-full" src={user.AvatarURL} />
 						<h1 class="text-3xl font-bold">{user.Name}</h1>
 						<p>{user.Bio}</p>
+
+						<!-- Additional Information -->
+						<p><strong>Username:</strong> {user.Login}</p>
+						<p><strong>Company:</strong> {user.Company}</p>
+						<p><strong>Blog:</strong> <a href={templ.URL(user.Blog)}>{user.Blog}</a></p>
+						<p><strong>Location:</strong> {user.Location}</p>
+						<p><strong>Email:</strong> {user.Email}</p>
+						<p><strong>Public Repos:</strong> { fmt.Sprintf("%d", user.PublicRepos) }</p>
+						<p><strong>Followers:</strong> { fmt.Sprintf("%d", user.Followers) }</p>
+						<p><strong>Following:</strong> { fmt.Sprintf("%d", user.Following) }</p>
+						<p><strong>Joined:</strong> {user.CreatedAt}</p>
 					</div>
 				</div>
 			</main>
 		</body>
 		@components.Footer()
 	</html>
-	<script>
-		function submit() {
-			{ fmt.Println("Form submitted!") }
-		}
-    </script>
-}
+}