fixes

Author: VishakhaSainani-Josh

backend/internal/app/auth/domain.go

@@ -34,9 +34,9 @@ type User struct {
 type GithubUserResponse struct {
 	GithubId       int    `json:"id"`
 	GithubUsername string `json:"login"`
-	AvatarUrl      string `json:"avatarUrl"`
+	AvatarUrl      string `json:"avatar_url"`
 	Email          string `json:"email"`
-	IsAdmin        bool   `json:"isAdmin"`
+	IsAdmin        bool   `json:"is_admin"`
 }
 
 type AdminLoginRequest struct {

backend/internal/app/contribution/service.go

@@ -179,8 +179,10 @@ func (s *service) GetContributionType(ctx context.Context, contribution Contribu
 	var stateReason string
 	if issuePayload, ok := contributionPayload[PayloadIssueKey]; ok {
 		issue = issuePayload.(map[string]interface{})
-		if stateReasonVal, ok := issue[PayloadStateReasonKey]; ok {
-			stateReason = stateReasonVal.(string)
+		if stateReasonVal, ok := issue[PayloadStateReasonKey]; ok && stateReasonVal != nil {
+			if v, ok := stateReasonVal.(string); ok {
+				stateReason = v
+			}
 		}
 	}
 

backend/internal/app/github/domain.go

@@ -12,11 +12,11 @@ type FetchRepositoryDetailsResponse struct {
 	Id              int       `json:"id"`
 	Name            string    `json:"name"`
 	Description     string    `json:"description"`
-	LanguagesURL    string    `json:"languagesUrl"`
-	UpdateDate      time.Time `json:"updatedAt"`
+	LanguagesURL    string    `json:"languages_url"`
+	UpdateDate      time.Time `json:"updated_at"`
 	RepoOwnerName   RepoOwner `json:"owner"`
-	ContributorsUrl string    `json:"contributorsUrl"`
-	RepoUrl         string    `json:"repoUrl"`
+	ContributorsUrl string    `json:"contributors_url"`
+	RepoUrl         string    `json:"html_url"`
 }
 
 type RepoLanguages map[string]int
@@ -32,7 +32,7 @@ type RepoContributorsResponse struct {
 type FetchRepositoryContributorsResponse struct {
 	Id            int    `json:"id"`
 	Name          string `json:"name"`
-	AvatarUrl     string `json:"avatarUrl"`
-	GithubUrl     string `json:"githubUrl"`
+	AvatarUrl     string `json:"avatar_url"`
+	GithubUrl     string `json:"github_url"`
 	Contributions int    `json:"contributions"`
 }

frontend/src/api/queries/Auth.ts

@@ -17,6 +17,7 @@ export const useGithubOauthLogin = (code: string | null) => {
   return useQuery({
     queryKey: [GITHUB_OAUTH_LOGIN_QUERY_KEY, code],
     queryFn: () => githubOauthLogin(code!),
-    enabled: !!code
+    enabled: !!code,
+    retry: false,
   });
 };

frontend/src/features/Login/components/LoginComponent.tsx

@@ -12,31 +12,24 @@ import { useEffect } from "react";
 import { setAccessToken } from "@/shared/utils/local-storage";
 import { useGithubOauthLogin } from "@/api/queries/Auth";
 import { toast } from "sonner";
-import { useLoggedInUser } from "@/api/queries/UserProfileDetails";
-import { ACCOUNT_INFO_PATH } from "@/shared/constants/routes";
 import githubIcon from "@/assets/github-white-icon.svg";
 const LoginComponent = () => {
   const [searchParams] = useSearchParams();
   const navigate = useNavigate();
 
   const code = searchParams.get("code");
+  console.log("code", code);
   const { data, isSuccess, isError } = useGithubOauthLogin(code);
-
-  const { refetch } = useLoggedInUser(false);
-
+  console.log("data", data);
+  console.log("isSuccess", isSuccess);
   useEffect(() => {
     if (!code) return;
 
     if (isSuccess && data?.data) {
       const token = data.data;
       setAccessToken(token);
 
-      refetch().then(({ data: userData }) => {
-        if (userData?.data?.isBlocked) {
-          navigate(ACCOUNT_INFO_PATH);
-        }
-      });
-
+      console.log("hello");
       navigate("/");
     }
 

…yDetails.tsx/components/Contributors.tsx …itoryDetails/components/Contributors.tsxfrontend/src/features/RepositoryDetails.tsx/components/Contributors.tsx renamed to frontend/src/features/RepositoryDetails/components/Contributors.tsx frontend/src/features/RepositoryDetails.tsx/components/Contributors.tsx renamed to frontend/src/features/RepositoryDetails/components/Contributors.tsx

@@ -49,8 +49,8 @@ const ContributorsList = () => {
               <ContributorsCard
                 key={contributor.id}
                 name={contributor.name}
-                avatarUrl={contributor.avatarUrl}
-                githubUrl={contributor.githubUrl}
+                avatarUrl={contributor.avatar_url}
+                githubUrl={contributor.github_url}
                 contributions={contributor.contributions}
               />
             ))}

…ails.tsx/components/ContributorsCard.tsx …yDetails/components/ContributorsCard.tsxfrontend/src/features/RepositoryDetails.tsx/components/ContributorsCard.tsx renamed to frontend/src/features/RepositoryDetails/components/ContributorsCard.tsx frontend/src/features/RepositoryDetails.tsx/components/ContributorsCard.tsx renamed to frontend/src/features/RepositoryDetails/components/ContributorsCard.tsx

@@ -1,7 +1,7 @@
 import { type FC } from "react";
-import LanguageCard from "../../RepositoryDetails.tsx/components/LanguagesCard";
 import { useRepositoryLanguages } from "@/api/queries/Languages";
 import { useParams } from "react-router-dom";
+import LanguageCard from "./LanguagesCard";
 
 interface LanguagesProps {
   className?: string;