Rework for Github API

ls1intum · Aug 21, 2024 · 45f228d · 45f228d
1 parent 45a6140
commit 45f228d
Show file tree

Hide file tree

Showing 11 changed files with 159 additions and 82 deletions.
diff --git a/server/application-server/pom.xml b/server/application-server/pom.xml
@@ -125,6 +125,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-graphql</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.kohsuke</groupId>
+			<artifactId>github-api</artifactId>
+			<version>1.324</version>
+		</dependency>
+
 	</dependencies>
 
 	<dependencyManagement>

diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/Application.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/Application.java
@@ -9,6 +9,7 @@
 
 import de.tum.in.www1.hephaestus.codereview.CodeReviewService;
 import de.tum.in.www1.hephaestus.codereview.repository.Repository;
+import de.tum.in.www1.hephaestus.codereview.repository.RepositoryService;
 
 @SpringBootApplication
 @Modulithic(systemName = "Hephaestus")
@@ -20,10 +21,15 @@ public static void main(String[] args) {
 	}
 
 	@Bean
-	CommandLineRunner commandLineRunner(CodeReviewService service) {
+	CommandLineRunner commandLineRunner(CodeReviewService service, RepositoryService repositoryService) {
 		return args -> {
-			Repository repo = service.getHephaestusRepository();
+			Repository repo = service.fetchHephaestus();
 			System.out.println(repo);
+			repositoryService.saveRepository(repo);
+			System.out.println("Saved repo: " + repositoryService.countRepositories());
+
+			Repository repo2 = repositoryService.getAllRepositories().get(0);
+			System.out.println(repo2);
 		};
 	}
 }
diff --git a/...lication-server/src/main/java/de/tum/in/www1/hephaestus/codereview/CodeReviewService.java b/...lication-server/src/main/java/de/tum/in/www1/hephaestus/codereview/CodeReviewService.java
@@ -1,10 +1,14 @@
 package de.tum.in.www1.hephaestus.codereview;
 
+import java.io.IOException;
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 
+import org.kohsuke.github.GHRepository;
+import org.kohsuke.github.GitHub;
+import org.kohsuke.github.GitHubBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -14,6 +18,7 @@
 
 import de.tum.in.www1.hephaestus.EnvConfig;
 import de.tum.in.www1.hephaestus.codereview.repository.Repository;
+import de.tum.in.www1.hephaestus.codereview.repository.RepositoryConverter;
 
 @Service
 public class CodeReviewService {
@@ -22,6 +27,8 @@ public class CodeReviewService {
 
         private final HttpSyncGraphQlClient graphQlClient;
 
+        private GitHub github;
+
         private final CodeReviewRepository codeReviewRepository;
 
         private final EnvConfig envConfig;
@@ -42,22 +49,36 @@ public CodeReviewService(CodeReviewRepository codeReviewRepository, EnvConfig en
                 graphQlClient = HttpSyncGraphQlClient.builder(restClient)
                                 .headers(headers -> headers.setBearerAuth(githubPat))
                                 .build();
+                try {
+                        github = new GitHubBuilder().withOAuthToken(envConfig.getGithubPat()).build();
+                } catch (IOException e) {
+                        logger.error("Error while creating GitHub client: " + e.getMessage());
+                        return;
+                }
+        }
+
+        public Repository fetchHephaestus() throws IOException {
+                if (github == null) {
+                        logger.error("GitHub client not initialized!");
+                        return null;
+                }
+
+                GHRepository ghRepo = github.getRepository("ls1intum/hephaestus");
+                System.out.println("Repository: " + ghRepo.toString());
+                Repository repository = new RepositoryConverter().convert(ghRepo);
+                return repository;
         }
 
         public Repository getHephaestusRepository() {
                 Repository example = new Repository();
                 example.setName("hephaestus");
                 example.setNameWithOwner("ls1intum/hephaestus");
                 Optional<Repository> foundRepo = codeReviewRepository.findOne(Example.of(example));
-                logger.info("Repository count: " + codeReviewRepository.count());
-
-                logger.info("Saved repo: " + foundRepo.toString());
                 if (foundRepo.isPresent()) {
                         return foundRepo.get();
                 }
 
                 logger.info("No repo found, creating new one...");
-
                 HashMap<String, Object> variables = new HashMap<>();
                 variables.put("owner", "ls1intum");
                 variables.put("name", "hephaestus");
@@ -67,16 +88,12 @@ public Repository getHephaestusRepository() {
                                 .variables(variables)
                                 .retrieveSync("repository")
                                 .toEntity(Repository.class);
-
                 if (repository == null) {
                         logger.error("Error while fetching repository!");
                         return null;
                 }
                 repository.setAddedAt(Instant.now());
-
-                System.out.println("Repository: " + repository.toString());
                 codeReviewRepository.saveAndFlush(repository);
-                System.out.println("New Repository count: " + codeReviewRepository.count());
                 return repository;
         }
 

diff --git a/...pplication-server/src/main/java/de/tum/in/www1/hephaestus/codereview/comment/Comment.java b/...pplication-server/src/main/java/de/tum/in/www1/hephaestus/codereview/comment/Comment.java
@@ -3,14 +3,14 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import de.tum.in.www1.hephaestus.codereview.actor.Actor;
+import de.tum.in.www1.hephaestus.codereview.pullrequest.Pullrequest;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToOne;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -60,8 +60,8 @@ public class Comment {
     /**
      * The parent connection to the pullrequest of the Comment entity.
      */
-    @OneToOne(optional = false)
-    @JoinColumn(name = "c_connection_id", referencedColumnName = "id")
-    private CommentConnection connection;
+    @ManyToOne(optional = false)
+    @JoinColumn(name = "pullrequest_id", referencedColumnName = "id")
+    private Pullrequest pullrequest;
 
 }
diff --git a/...-server/src/main/java/de/tum/in/www1/hephaestus/codereview/comment/CommentConnection.java b/...-server/src/main/java/de/tum/in/www1/hephaestus/codereview/comment/CommentConnection.java
diff --git a/...on-server/src/main/java/de/tum/in/www1/hephaestus/codereview/pullrequest/Pullrequest.java b/...on-server/src/main/java/de/tum/in/www1/hephaestus/codereview/pullrequest/Pullrequest.java
@@ -1,7 +1,10 @@
 package de.tum.in.www1.hephaestus.codereview.pullrequest;
 
+import java.util.List;
+
 import de.tum.in.www1.hephaestus.codereview.actor.Actor;
-import de.tum.in.www1.hephaestus.codereview.comment.CommentConnection;
+import de.tum.in.www1.hephaestus.codereview.comment.Comment;
+import de.tum.in.www1.hephaestus.codereview.repository.Repository;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.persistence.CascadeType;
@@ -12,7 +15,7 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToOne;
+import jakarta.persistence.OneToMany;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -80,17 +83,13 @@ public class Pullrequest {
     @JoinColumn(name = "author_id")
     private Actor author;
 
-    /**
-     * The comments of the Pullrequest entity.
-     */
-    @OneToOne(cascade = CascadeType.ALL, optional = false)
-    @JoinColumn(name = "c_connection_id", referencedColumnName = "id")
-    private CommentConnection comments;
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "pullrequest")
+    private List<Comment> pullRequests;
 
     /**
      * The parent connection of the Pullrequest entity.
      */
-    @OneToOne(optional = false)
-    @JoinColumn(name = "pr_connection_id", referencedColumnName = "id")
-    private PullrequestConnection connection;
+    @ManyToOne(optional = false)
+    @JoinColumn(name = "repository_id", referencedColumnName = "id")
+    private Repository repository;
 }
diff --git a/...src/main/java/de/tum/in/www1/hephaestus/codereview/pullrequest/PullrequestConnection.java b/...src/main/java/de/tum/in/www1/hephaestus/codereview/pullrequest/PullrequestConnection.java
diff --git a/...tion-server/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/Repository.java b/...tion-server/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/Repository.java
@@ -1,16 +1,16 @@
 package de.tum.in.www1.hephaestus.codereview.repository;
 
 import java.time.Instant;
+import java.util.List;
 
-import de.tum.in.www1.hephaestus.codereview.pullrequest.PullrequestConnection;
+import de.tum.in.www1.hephaestus.codereview.pullrequest.Pullrequest;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
+import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
@@ -43,15 +43,15 @@ public class Repository {
     @Column
     private String url;
 
-    @OneToOne(cascade = CascadeType.ALL, optional = false)
-    @JoinColumn(name = "connection_id", referencedColumnName = "id")
-    private PullrequestConnection pullRequests;
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "repository")
+    private List<Pullrequest> pullRequests;
 
     @Column(name = "added_at")
     private Instant addedAt;
 
     public String toString() {
         return "Repository [id=" + id + ", name=" + name + ", nameWithOwner=" + nameWithOwner + ", description="
-                + description + ", url=" + url + ", pullRequests=" + pullRequests + ", addedAt=" + addedAt + "]";
+                + description + ", url=" + url + ", pullRequests=" + pullRequests + ", addedAt=" + addedAt
+                + "]";
     }
 }
diff --git a/...er/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/RepositoryConverter.java b/...er/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/RepositoryConverter.java
@@ -0,0 +1,28 @@
+package de.tum.in.www1.hephaestus.codereview.repository;
+
+import java.time.Instant;
+
+import org.kohsuke.github.GHRepository;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.ReadingConverter;
+import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Service;
+
+@Service
+@ReadingConverter
+public class RepositoryConverter implements Converter<GHRepository, Repository> {
+
+    @Override
+    @Nullable
+    public Repository convert(@NonNull GHRepository source) {
+        Repository repository = new Repository();
+        repository.setName(source.getName());
+        repository.setNameWithOwner(source.getFullName());
+        repository.setUrl(source.getHtmlUrl().toString());
+        repository.setDescription(source.getDescription());
+        repository.setAddedAt(Instant.now());
+        return repository;
+    }
+
+}
diff --git a/...r/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/RepositoryRepository.java b/...r/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/RepositoryRepository.java
@@ -0,0 +1,14 @@
+package de.tum.in.www1.hephaestus.codereview.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import de.tum.in.www1.hephaestus.codereview.repository.Repository;
+
+@org.springframework.stereotype.Repository
+public interface RepositoryRepository
+                extends JpaRepository<Repository, Long> {
+
+        @Query("SELECT r FROM Repository r WHERE r.nameWithOwner = ?1")
+        Repository findByNameWithOwner(String nameWithOwner);
+}
diff --git a/...rver/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/RepositoryService.java b/...rver/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/RepositoryService.java
@@ -0,0 +1,57 @@
+package de.tum.in.www1.hephaestus.codereview.repository;
+
+import java.time.Instant;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RepositoryService {
+    private static final Logger logger = LoggerFactory.getLogger(Repository.class);
+
+    private final RepositoryRepository repositoryRepository;
+
+    public RepositoryService(RepositoryRepository repositoryRepository) {
+        this.repositoryRepository = repositoryRepository;
+    }
+
+    /**
+     * Retrieves all {@link Repository} entities.
+     * 
+     * @return A list of all Repository entities
+     */
+    public List<Repository> getAllRepositories() {
+        var repositories = repositoryRepository.findAll();
+        logger.info("Getting Repositories: {}", repositories);
+        return repositoryRepository.findAll();
+    }
+
+    public Repository getRepository(String nameWithOwner) {
+        return repositoryRepository.findByNameWithOwner(nameWithOwner);
+    }
+
+    /**
+     * Creates a new {@link Repository} entity with the current timestamp and saves
+     * it to
+     * the repository.
+     * 
+     * @return The created Repository entity
+     */
+    public Repository addRepository() {
+        Repository repository = new Repository();
+        repository.setAddedAt(Instant.now());
+        logger.info("Adding new Repository with timestamp: {}", repository.getAddedAt());
+        return repositoryRepository.save(repository);
+    }
+
+    public Repository saveRepository(Repository repository) {
+        logger.info("Adding Repository: {}", repository.getNameWithOwner());
+        return repositoryRepository.save(repository);
+    }
+
+    public long countRepositories() {
+        return repositoryRepository.count();
+    }
+}