feat: update source_id to i64

Author: McPatate

init_db.sql

@@ -6,7 +6,7 @@ CREATE EXTENSION vector;
 
 CREATE TABLE issues (
   id SERIAL PRIMARY KEY,
-  source_id VARCHAR NOT NULL UNIQUE,
+  source_id BIGINT NOT NULL UNIQUE,
   source VARCHAR NOT NULL,
   title TEXT NOT NULL,
   body TEXT NOT NULL,
@@ -22,7 +22,7 @@ CREATE TABLE issues (
 
 CREATE TABLE comments (
   id SERIAL PRIMARY KEY,
-  source_id VARCHAR NOT NULL UNIQUE,
+  source_id BIGINT NOT NULL UNIQUE,
   issue_id INT NOT NULL REFERENCES issues(id) ON DELETE CASCADE,
   body TEXT NOT NULL,
   url VARCHAR NOT NULL,

issue-bot/src/main.rs

@@ -178,7 +178,7 @@ async fn start_main_server(config: ServerConfig, state: AppState) -> anyhow::Res
 }
 
 struct IssueData {
-    source_id: String,
+    source_id: i64,
     action: Action,
     title: String,
     body: String,
@@ -191,9 +191,9 @@ struct IssueData {
 }
 
 struct CommentData {
-    source_id: String,
+    source_id: i64,
     action: Action,
-    issue_id: String,
+    issue_id: i64,
     body: String,
     url: String,
 }
@@ -402,7 +402,7 @@ async fn handle_webhooks(
                         r#"insert into issues (source_id, source, title, body, is_pull_request, number, html_url, url, repository_full_name, embedding)
                            values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)"#
                         )
-                        .bind(&issue.source_id)
+                        .bind(issue.source_id)
                         .bind(issue.source.to_string())
                         .bind(issue.title)
                         .bind(issue.body)
@@ -612,7 +612,7 @@ async fn handle_webhooks(
                             Vector::from(raw_embedding);
                         let issue_id: Option<i32> = match sqlx::query_scalar!(
                             "select id from issues where source_id = $1",
-                            issue.id.to_string()
+                            issue.id
                         )
                         .fetch_optional(&pool)
                         .await {
@@ -630,7 +630,7 @@ async fn handle_webhooks(
                                values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
                                returning id"#
                             )
-                            .bind(issue.id.to_string())
+                            .bind(issue.id)
                             .bind(source)
                             .bind(issue.title)
                             .bind(issue.body)
@@ -751,7 +751,7 @@ async fn handle_webhooks(
                     let embedding = Vector::from(raw_embedding);
                     let issue_id: Option<i32> = match sqlx::query_scalar!(
                         "select id from issues where source_id = $1",
-                        issue.id.to_string()
+                        issue.id
                     )
                     .fetch_optional(&pool)
                     .await
@@ -774,7 +774,7 @@ async fn handle_webhooks(
                            values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
                            returning id"#
                         )
-                        .bind(issue.id.to_string())
+                        .bind(issue.id)
                         .bind(source)
                         .bind(issue.title)
                         .bind(issue.body)
@@ -868,7 +868,7 @@ async fn handle_webhooks(
                         info!("regenerating embeddings for {} issues", total_issues);
                         for (current_issue_nb, issue) in issues.into_iter().enumerate() {
                             if let Err(err) =
-                                update_issue_embeddings(&embedding_api, &pool, &issue.source_id)
+                                update_issue_embeddings(&embedding_api, &pool, issue.source_id)
                                     .await
                             {
                                 error!(
@@ -927,7 +927,7 @@ async fn handle_webhooks(
         };
 
         if let Some(issue_id) = issue_id {
-            if let Err(err) = update_issue_embeddings(&embedding_api, &pool, &issue_id).await {
+            if let Err(err) = update_issue_embeddings(&embedding_api, &pool, issue_id).await {
                 error!(
                     issue_id = issue_id,
                     err = err.to_string(),
@@ -941,15 +941,15 @@ async fn handle_webhooks(
 async fn update_issue_embeddings(
     embedding_api: &EmbeddingApi,
     pool: &Pool<Postgres>,
-    issue_id: &str,
+    issue_id: i64,
 ) -> anyhow::Result<()> {
     let issue = sqlx::query!(
         r#"
             SELECT
               i.title,
               i.body,
               (
-                SELECT JSON_AGG(c.body)
+                SELECT JSON_AGG(c.body ORDER BY c.source_id)
                 FROM comments AS c
                 WHERE c.issue_id = i.id
               ) AS comments

issue-bot/src/routes.rs

@@ -170,7 +170,7 @@ pub async fn github_webhook(
                     state
                         .tx
                         .send(EventData::Issue(crate::IssueData {
-                            source_id: issue.issue.id.to_string(),
+                            source_id: issue.issue.id,
                             action: issue.action.to_action(),
                             title: issue.issue.title,
                             body: issue.issue.body,
@@ -191,8 +191,8 @@ pub async fn github_webhook(
             state
                 .tx
                 .send(EventData::Comment(crate::CommentData {
-                    source_id: comment.comment.id.to_string(),
-                    issue_id: comment.issue.id.to_string(),
+                    source_id: comment.comment.id,
+                    issue_id: comment.issue.id,
                     action: comment.action.to_action(),
                     body: comment.comment.body,
                     url: comment.comment.url,
@@ -293,7 +293,7 @@ struct Url {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct Discussion {
-    id: String,
+    id: i64,
     is_pull_request: bool,
     num: i32,
     title: String,
@@ -313,7 +313,7 @@ struct Author {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct HfComment {
-    id: String,
+    id: i64,
     #[serde(default)]
     content: String,
     author: Author,