fix: docker flow

.github/workflows/ci.yaml

@@ -65,7 +65,6 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     needs: [cargo-check, fmt-check, test-and-coverage]
-    # needs: [fmt-check]
     steps:
       - name: Check out from Git
         uses: actions/checkout@v4
@@ -103,7 +102,6 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     needs: [cargo-check, fmt-check, test-and-coverage]
-    # needs: [fmt-check]
     steps:
       - name: Check out from Git
         uses: actions/checkout@v4

.github/workflows/docker.yml

@@ -0,0 +1,17 @@
+name: Docker build
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build-docker-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out from Git
+        uses: actions/checkout@v4
+
+      - name: Build docker image
+        run: |
+          docker build .

Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-members = ["src/public"]
+members = ["src/public", "src/grpc_server"]
 resolver = "2"

Dockerfile

@@ -3,6 +3,7 @@
 FROM clux/muslrust:stable AS chef
 USER root
 RUN cargo install cargo-chef
+
 WORKDIR /app
 
 FROM clux/muslrust:stable AS bunyan

src/adapter/Cargo.toml

@@ -42,4 +42,10 @@ version = "1.36.0"
 features = ["full"]
 
 [dependencies.anyhow]
-version = "1.0.80"
+version = "1.0.80"
+
+[dependencies.tonic]
+version = "0.11.0"
+
+[dependencies.grpc_interface]
+path = "../grpc"

src/adapter/src/repositories/grpc/config.rs

@@ -0,0 +1,15 @@
+use serde::Deserialize;
+
+/// Represents servers configuration options.
+#[derive(Deserialize, Debug)]
+pub struct GrpcServers {
+    /// Configuration for using in-memory database.
+    pub gpt_answer_service: Option<ServiceServer>,
+}
+
+/// Represents service server configuration.
+#[derive(Debug, Deserialize, Clone)]
+pub struct ServiceServer {
+    /// URL for the server.
+    pub url: String,
+}

src/adapter/src/repositories/grpc/mod.rs

@@ -0,0 +1,2 @@
+pub mod config;
+pub mod models;

src/grpc/src/grpc_client/gpt_answer.rs → src/adapter/src/repositories/grpc/models/gpt_answer.rs

@@ -1,11 +1,9 @@
 use rust_core::common::errors::CoreError;
 use tonic::transport::Channel;
 
-use gpt_answer::gpt_answer_service_client::GptAnswerServiceClient;
-
-mod gpt_answer {
-    tonic::include_proto!("gpt_answer");
-}
+use grpc_interface::interfaces::gpt_answer::gpt_answer::{
+    gpt_answer_service_client::GptAnswerServiceClient, GetAnswerPayload,
+};
 
 pub struct GptAnswerGrpcClient {
     client: GptAnswerServiceClient<Channel>,
@@ -17,10 +15,9 @@ impl GptAnswerGrpcClient {
         Self { client }
     }
 
-    pub async fn get_instance() -> Result<Self, CoreError> {
-        let uri = "http://0.0.0.0:50051";
+    pub async fn get_instance(uri: &'static str) -> Result<Self, CoreError> {
         let channel = Channel::from_static(uri).connect().await.map_err(|err| {
-            println!("Error connecting to GPT: {:?}", err);
+            eprintln!("Error connecting to GPT: {:?}", err);
             CoreError::InternalError
         })?;
 
@@ -29,12 +26,12 @@ impl GptAnswerGrpcClient {
     }
 
     pub async fn get_answer(&mut self, question: &str) -> Result<String, CoreError> {
-        let request = tonic::Request::new(gpt_answer::GetAnswerPayload {
+        let request = tonic::Request::new(GetAnswerPayload {
             question: question.to_string(),
         });
 
         let response = self.client.get_answer(request).await.map_err(|err| {
-            println!("Error getting answer from GPT: {:?}", err);
+            eprintln!("Error getting answer from GPT: {:?}", err);
             CoreError::InternalError
         })?;
 

src/adapter/src/repositories/mod.rs

@@ -1,3 +1,4 @@
+pub mod grpc;
 pub mod in_memory;
 pub mod postgres;
 pub mod repository_test;

src/adapter/src/repositories/postgres/models/question.rs

@@ -1,8 +1,10 @@
-use std::time::SystemTime;
+use std::{
+    io::{Error, ErrorKind},
+    time::SystemTime,
+};
 
 use diesel::{AsChangeset, Identifiable, Insertable, Queryable, Selectable};
-use rust_core::common::errors::CoreError;
-use rust_core::entities::question::QuestionEntity;
+use rust_core::entities::question::{QuestionEntity, QuestionId};
 use serde::Serialize;
 
 #[derive(Debug, Queryable, Serialize, Selectable, Insertable, AsChangeset, Identifiable)]
@@ -20,23 +22,33 @@ pub struct QuestionModel {
     pub created_on: SystemTime,
 }
 
-impl QuestionModel {
-    pub fn from(entity: QuestionEntity) -> Result<Self, CoreError> {
+impl TryFrom<QuestionEntity> for QuestionModel {
+    type Error = Error;
+
+    fn try_from(entity: QuestionEntity) -> Result<QuestionModel, Self::Error> {
+        let id = entity
+            .id
+            .0
+            .parse()
+            .map_err(|_| Error::new(ErrorKind::InvalidInput, "Invalid ID"))?;
+
         Ok(QuestionModel {
-            id: entity.id.to_string().parse()?,
+            id,
             title: entity.title,
             content: entity.content,
             tags: entity.tags.map(|v| v.into_iter().map(Some).collect()),
             created_on: SystemTime::now(),
         })
     }
+}
 
-    pub fn to_entity(self) -> Result<QuestionEntity, CoreError> {
-        Ok(QuestionEntity {
-            id: self.id.to_string().parse()?,
+impl Into<QuestionEntity> for QuestionModel {
+    fn into(self) -> QuestionEntity {
+        QuestionEntity {
+            id: QuestionId(self.id.to_string()),
             title: self.title,
             content: self.content,
             tags: self.tags.map(|v| v.into_iter().flatten().collect()),
-        })
+        }
     }
 }