fix login and minor styling adjustments

ls1intum · Oct 27, 2024 · 318c73b · 318c73b
1 parent dd37c8a
commit 318c73b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/.../main/java/de/tum/in/www1/hephaestus/gitprovider/issuecomment/IssueCommentRepository.java b/.../main/java/de/tum/in/www1/hephaestus/gitprovider/issuecomment/IssueCommentRepository.java
@@ -17,7 +17,7 @@ public interface IssueCommentRepository extends JpaRepository<IssueComment, Long
             LEFT JOIN FETCH ic.issue
             LEFT JOIN FETCH ic.issue.repository
             WHERE 
-                ic.author.login = :authorLogin AND ic.createdAt >= :activitySince
+                ic.author.login ILIKE :authorLogin AND ic.createdAt >= :activitySince
                 AND (:onlyFromPullRequests = false OR ic.issue.htmlUrl LIKE '%/pull/%')
             ORDER BY ic.createdAt DESC
             """)

diff --git a/...rc/main/java/de/tum/in/www1/hephaestus/gitprovider/pullrequest/PullRequestRepository.java b/...rc/main/java/de/tum/in/www1/hephaestus/gitprovider/pullrequest/PullRequestRepository.java
@@ -16,7 +16,7 @@ public interface PullRequestRepository extends JpaRepository<PullRequest, Long>
     @Query("""
             SELECT MIN(p.createdAt)
             FROM PullRequest p
-            WHERE p.author.login = :authorLogin
+            WHERE p.author.login ILIKE :authorLogin
             """)
     Optional<OffsetDateTime> firstContributionByAuthorLogin(@Param("authorLogin") String authorLogin);
 
@@ -27,7 +27,7 @@ SELECT MIN(p.createdAt)
             JOIN FETCH p.author
             LEFT JOIN FETCH p.assignees
             LEFT JOIN FETCH p.repository
-            WHERE (p.author.login = :assigneeLogin OR :assigneeLogin IN (SELECT u.login FROM p.assignees u)) AND p.state IN :states
+            WHERE (p.author.login ILIKE :assigneeLogin OR LOWER(:assigneeLogin) IN (SELECT LOWER(u.login) FROM p.assignees u)) AND p.state IN :states
             ORDER BY p.createdAt DESC
             """)
     List<PullRequest> findAssignedByLoginAndStates(

diff --git a/.../de/tum/in/www1/hephaestus/gitprovider/pullrequestreview/PullRequestReviewRepository.java b/.../de/tum/in/www1/hephaestus/gitprovider/pullrequestreview/PullRequestReviewRepository.java
@@ -19,7 +19,7 @@ public interface PullRequestReviewRepository extends JpaRepository<PullRequestRe
             LEFT JOIN FETCH prr.pullRequest
             LEFT JOIN FETCH prr.pullRequest.repository
             LEFT JOIN FETCH prr.comments
-            WHERE prr.author.login = :authorLogin AND prr.submittedAt >= :activitySince
+            WHERE prr.author.login ILIKE :authorLogin AND prr.submittedAt >= :activitySince
             ORDER BY prr.submittedAt DESC
             """)
     List<PullRequestReview> findAllByAuthorLoginSince(

diff --git a/.../src/main/java/de/tum/in/www1/hephaestus/gitprovider/repository/RepositoryRepository.java b/.../src/main/java/de/tum/in/www1/hephaestus/gitprovider/repository/RepositoryRepository.java
@@ -16,7 +16,7 @@ public interface RepositoryRepository
             SELECT r
             FROM Repository r
             JOIN PullRequest pr ON r.id = pr.repository.id
-            WHERE pr.author.login = :contributorLogin
+            WHERE pr.author.login ILIKE :contributorLogin
             ORDER BY r.name ASC
             """)
     List<Repository> findContributedByLogin(@Param("contributorLogin") String contributorLogin);

diff --git a/...ation-server/src/main/java/de/tum/in/www1/hephaestus/gitprovider/user/UserRepository.java b/...ation-server/src/main/java/de/tum/in/www1/hephaestus/gitprovider/user/UserRepository.java
@@ -11,7 +11,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
     @Query("""
                 SELECT u
                 FROM User u
-                WHERE u.login = :login
+                WHERE u.login ILIKE :login
             """)
     Optional<User> findByLogin(@Param("login") String login);
 }
diff --git a/webapp/src/app/core/header/header.component.html b/webapp/src/app/core/header/header.component.html
@@ -7,7 +7,7 @@
   <app-request-feature class="sm:hidden" iconOnly />
   <app-theme-switcher />
   @if (signedIn()) {
-    <button [brnMenuTriggerFor]="usermenu" class="ml-4">
+    <button [brnMenuTriggerFor]="usermenu" class="ml-2">
       <hlm-avatar>
         <img [src]="'https://github.com/' + user()!.username + '.png'" [alt]="user()?.name + '\'s avatar'" hlmAvatarImage />
         <span hlmAvatarFallback>
@@ -25,9 +25,7 @@
             <hlm-icon name="lucideUser" hlmMenuIcon />
             <span>My Profile</span>
           </a>
-
           <hlm-menu-separator />
-
           <button hlmMenuItem (click)="signOut()" class="cursor-pointer">
             <hlm-icon name="lucideLogOut" hlmMenuIcon />
             <span>Sign&nbsp;Out</span>

diff --git a/webapp/src/app/home/leaderboard/leaderboard.component.ts b/webapp/src/app/home/leaderboard/leaderboard.component.ts
@@ -53,7 +53,7 @@ export class LeaderboardComponent {
   user = this.securityStore.loadedUser;
 
   trClass = (entry: LeaderboardEntry) => {
-    return cn('cursor-pointer', this.signedIn() && this.user()?.username === entry.user.login ? 'bg-emerald-950' : '');
+    return cn('cursor-pointer', this.signedIn() && this.user()?.username.toLowerCase() === entry.user.login.toLowerCase() ? 'bg-accent' : '');
   };
 
   leaderboard = input<LeaderboardEntry[]>();