Added issue labels

backend/api/Cargo.toml

@@ -25,6 +25,7 @@ store.workspace = true
 support.workspace = true
 config.workspace = true
 actix-cors.workspace = true
+futures = "0.3.29"
 
 [dev-dependencies]
 adtest.workspace = true

backend/api/src/api/repository/infrastructure/repository.rs

@@ -7,7 +7,7 @@ use sea_orm::{
 };
 use std::sync::Arc;
 use store::{
-    github_projects, github_repositories, issues,
+    github_projects, github_repositories, issue_labels, issues,
     objects::{GithubIssue, RepositoryView, SearchRepository},
 };
 use support::pagination::Pagination;
@@ -34,7 +34,24 @@ impl DbRepositoryContract for PgRepository {
         repository_id: Uuid,
         params: GetIssuesParams,
     ) -> Result<Pagination<GithubIssue>> {
-        let mut query = issues::Entity::find().filter(issues::Column::Repository.eq(repository_id));
+        let mut query = issues::Entity::find()
+            .filter(issues::Column::Repository.eq(repository_id))
+            .inner_join(issue_labels::Entity)
+            .select_only()
+            .columns([
+                issues::Column::Id,
+                issues::Column::Repository,
+                issues::Column::Issue,
+                issues::Column::Title,
+                issues::Column::Description,
+                issues::Column::CreatedAt,
+                issues::Column::Closed,
+            ])
+            .column_as(
+                Expr::cust_with_expr("array_agg($1)", issue_labels::Column::Name.into_expr()),
+                "labels",
+            )
+            .group_by(issues::Column::Id);
 
         if let Some(closed) = params.closed {
             query = query.filter(issues::Column::Closed.eq(closed));

backend/api/src/jobs/github_issues/contract.rs

@@ -21,7 +21,7 @@ pub trait DbRepositoryContract {
 #[async_trait]
 pub trait DbServiceContract {
     ///
-    /// Create entities in `issues` table
+    /// Create single issue in `issues` table, and it's labels
     ///
-    async fn create_issues(&self, repository_id: Uuid, issues: Vec<GithubIssue>) -> Result<()>;
+    async fn create_issues(&self, repository_id: Uuid, issue: GithubIssue) -> Result<()>;
 }

backend/api/src/jobs/github_issues/domain.rs

@@ -1,5 +1,6 @@
 use cronus::{Job, Schedule};
 use error::{Error, Result};
+use futures::future::join_all;
 use sdks::github::GithubContract;
 use std::time::Duration;
 use store::{
@@ -88,7 +89,15 @@ impl<
                 break;
             }
 
-            self.service.create_issues(repository.id, issues).await?;
+            let futures = issues
+                .into_iter()
+                .map(|issue| self.service.create_issues(repository.id, issue));
+
+            let results = join_all(futures).await;
+            for result in results {
+                result?;
+            }
+
             page += 1;
         }
 

backend/api/src/jobs/github_issues/infrastructure/service.rs

@@ -1,12 +1,18 @@
-use error::Result;
+use error::{Error, Result};
 use sdks::github::data::{GithubIssue, State};
 use sea_orm::{
-    prelude::Uuid, sea_query::OnConflict, ActiveValue::Set, DatabaseConnection, EntityTrait,
+    prelude::Uuid,
+    sea_query::OnConflict,
+    ActiveValue::{NotSet, Set},
+    DatabaseConnection, EntityTrait, TransactionTrait,
 };
 use std::sync::Arc;
 
 use super::super::contract::DbServiceContract;
-use store::issues::{ActiveModel, Column, Entity};
+use store::{
+    issue_labels,
+    issues::{ActiveModel, Column, Entity},
+};
 
 pub struct PgService {
     conn: Arc<DatabaseConnection>,
@@ -20,27 +26,51 @@ impl PgService {
 
 #[async_trait]
 impl DbServiceContract for PgService {
-    async fn create_issues(&self, repository_id: Uuid, issues: Vec<GithubIssue>) -> Result<()> {
-        let models = issues
-            .into_iter()
-            .map(|issue| ActiveModel {
-                repository: Set(repository_id),
-                issue: Set(issue.number),
-                title: Set(issue.title),
-                description: Set(issue.description),
-                created_at: Set(issue.created_at),
-                closed: Set(issue.state == State::Closed),
-                id: Default::default(),
-            })
-            .collect::<Vec<_>>();
+    async fn create_issues(&self, repository_id: Uuid, issue: GithubIssue) -> Result<()> {
+        self.conn
+            .as_ref()
+            .transaction::<_, (), sea_orm::error::DbErr>(|txn| {
+                Box::pin(async move {
+                    let model = ActiveModel {
+                        repository: Set(repository_id),
+                        issue: Set(issue.number),
+                        title: Set(issue.title),
+                        description: Set(issue.description),
+                        created_at: Set(issue.created_at),
+                        closed: Set(issue.state == State::Closed),
+                        id: Default::default(),
+                    };
+
+                    let mut on_conflict = OnConflict::columns([Column::Repository, Column::Issue]);
+                    on_conflict.update_columns([
+                        Column::Title,
+                        Column::Description,
+                        Column::Closed,
+                    ]);
 
-        let mut on_conflict = OnConflict::columns([Column::Repository, Column::Issue]);
-        on_conflict.update_columns([Column::Title, Column::Description, Column::Closed]);
+                    let issue_id = Entity::insert(model)
+                        .on_conflict(on_conflict)
+                        .exec_with_returning(txn)
+                        .await?
+                        .id;
 
-        Entity::insert_many(models)
-            .on_conflict(on_conflict)
-            .exec(self.conn.as_ref())
-            .await?;
+                    let labels = issue
+                        .labels
+                        .into_iter()
+                        .map(|label| issue_labels::ActiveModel {
+                            id: NotSet,
+                            issue_id: Set(issue_id),
+                            name: Set(label.name),
+                        })
+                        .collect::<Vec<_>>();
+
+                    issue_labels::Entity::insert_many(labels).exec(txn).await?;
+
+                    Ok(())
+                })
+            })
+            .await
+            .map_err(|e| Error::InternalServer(e.to_string()))?;
 
         Ok(())
     }

backend/libs/sdks/src/github/data.rs

@@ -51,6 +51,12 @@ pub struct GithubIssue {
     #[serde(deserialize_with = "deserialize_datetime")]
     pub updated_at: NaiveDateTime,
     pub state: State,
+    pub labels: Vec<Label>
+}
+
+#[derive(Deserialize)]
+pub struct Label{
+    pub name: String
 }
 
 #[derive(Deserialize, PartialEq, Eq)]

backend/libs/store/src/migrations/issue_labels.rs

@@ -0,0 +1,34 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
+
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "issue_labels")]
+#[serde(rename_all = "camelCase")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: Uuid,
+    pub issue_id: Uuid,
+    #[sea_orm(column_type = "Text")]
+    pub name: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::issues::Entity",
+        from = "Column::IssueId",
+        to = "super::issues::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Issues,
+}
+
+impl Related<super::issues::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Issues.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}

backend/libs/store/src/migrations/issues.rs

@@ -28,6 +28,8 @@ pub enum Relation {
         on_delete = "Cascade"
     )]
     GithubRepositories,
+    #[sea_orm(has_many = "super::issue_labels::Entity")]
+    IssueLabels,
 }
 
 impl Related<super::github_repositories::Entity> for Entity {
@@ -36,4 +38,10 @@ impl Related<super::github_repositories::Entity> for Entity {
     }
 }
 
+impl Related<super::issue_labels::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::IssueLabels.def()
+    }
+}
+
 impl ActiveModelBehavior for ActiveModel {}

backend/libs/store/src/migrations/mod.rs

@@ -5,5 +5,6 @@ pub mod prelude;
 pub mod cryptocurrencies;
 pub mod github_projects;
 pub mod github_repositories;
+pub mod issue_labels;
 pub mod issues;
 pub mod topics_repositories;

backend/libs/store/src/migrations/prelude.rs

@@ -3,5 +3,6 @@
 pub use super::cryptocurrencies::Entity as Cryptocurrencies;
 pub use super::github_projects::Entity as GithubProjects;
 pub use super::github_repositories::Entity as GithubRepositories;
+pub use super::issue_labels::Entity as IssueLabels;
 pub use super::issues::Entity as Issues;
 pub use super::topics_repositories::Entity as TopicsRepositories;

backend/libs/store/src/objects/issues.rs

@@ -12,4 +12,5 @@ pub struct GithubIssue {
     pub description: Option<String>,
     pub created_at: DateTime,
     pub closed: bool,
+    pub labels: Vec<String>
 }

backend/migrations/2023-12-09-122605_issue-labels/down.sql

@@ -0,0 +1 @@
+drop table issue_labels;

backend/migrations/2023-12-09-122605_issue-labels/up.sql

@@ -0,0 +1,5 @@
+create table issue_labels(
+    id uuid primary key default uuid_generate_v4() not null,
+    issue_id uuid not null references issues(id) on delete cascade,
+    name text not null
+)