Merge pull request #43 from cu-devclub/dev

Dev

.github/workflows/datasource.yml

@@ -23,5 +23,5 @@ jobs:
                 
             - name: Copy Data source directory to Server
               run: |
-                scp -i ~/.ssh/id_rsa data ${{ secrets.LINUX_USERNAME }}@${{ secrets.LINUX_HOST }}:~/dhammanava-search
+                scp -r -i ~/.ssh/id_rsa data ${{ secrets.LINUX_USERNAME }}@${{ secrets.LINUX_HOST }}:~/dhammanava-search
             

.github/workflows/monitoring.yml

@@ -32,4 +32,4 @@ jobs:
           key: ${{ secrets.LINUX_PRIVATE_KEY }}
           script: |
             cd dhammanava-search
-            docker compose -f docker-compose.prod.yml up -d loki promtail grafana
+            docker compose -f docker-compose.prod.yml up -d loki promtail grafana prometheus

docker-compose.dev.yml

@@ -21,6 +21,7 @@ services:
       - 8081:8081
     depends_on:
       - elastic-db
+      - rabbitmq
     labels:
       logging: "promtail"
       loggin_jobname: "containerlogs"
@@ -153,6 +154,9 @@ services:
       loggin_jobname: "containerlogs"
     depends_on:
       - data-db
+      - rabbitmq
+      - auth-service
+      - search-service
     networks:
       - dhammanava_network
 
@@ -173,6 +177,7 @@ services:
 
   rabbitmq:
     image: "rabbitmq:3.12-management"
+    container_name: rabbitmq
     ports:
       - "5672:5672"
       - "15672:15672"
@@ -223,13 +228,13 @@ services:
 
   grafana:
     image: grafana/grafana:10.3.5
+    container_name: grafana
     ports:
       - 3000:3000
     volumes:
       - ./monitoring/grafana/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
       - ./monitoring/grafana/main-dashboard.json:/var/lib/grafana/dashboards/dashboard.json
       - ./monitoring/grafana/dashboard.yml:/etc/grafana/provisioning/dashboards/main.yml
-      - ./monitoring/grafana/grafana.ini:/etc/grafana/grafana.ini
     environment:
       - GF_AUTH_ANONYMOUS_ENABLED=true
       - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin

docker-compose.prod.yml

@@ -22,6 +22,7 @@ services:
     restart: always
     depends_on:
       - elastic-db
+      - rabbitmq
     networks:
       - dhammanava_network
 
@@ -57,6 +58,9 @@ services:
     ports:
       - 9200:9200
     restart: always
+    labels:
+      logging: "promtail"
+      loggin_jobname: "containerlogs"
     mem_limit: 1g
     networks:
       - dhammanava_network
@@ -141,6 +145,9 @@ services:
     restart: always
     depends_on:
       - data-db
+      - rabbitmq
+      - auth-service
+      - search-service
     labels:
       logging: "promtail"
       loggin_jobname: "containerlogs"
@@ -164,6 +171,7 @@ services:
 
   rabbitmq:
     image: "rabbitmq:3-alpine"
+    container_name: rabbitmq-container
     environment:
       RABBITMQ_DEFAULT_USER: ${RABBITMQ_USERNAME}
       RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
@@ -208,6 +216,8 @@ services:
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
+    volumes:
+      - ./volumes/monitoring/loki:/loki
     networks:
       - dhammanava_network
 
@@ -226,6 +236,7 @@ services:
 
   grafana:
     image: grafana/grafana:10.3.5
+    container_name: grafana
     ports:
       - 3000:3000
     volumes:
@@ -234,9 +245,7 @@ services:
       - ./monitoring/grafana/dashboard.yml:/etc/grafana/provisioning/dashboards/main.yml
       - ./monitoring/grafana/grafana.ini.prod:/etc/grafana/grafana.ini
     environment:
-      - GF_AUTH_ANONYMOUS_ENABLED=true
-      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
-      - GF_AUTH_DISABLE_LOGIN_FORM=true
+      - GF_AUTH_DISABLE_LOGIN_FORM=false
       - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME}
       - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
     networks:
@@ -247,6 +256,7 @@ services:
     container_name: prometheus
     volumes:
       - ./monitoring/prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./volumes/monitoring/prometheus:/prometheus
     command:
       - "--config.file=/etc/prometheus/prometheus.yml"
     networks:

frontend/.env

@@ -0,0 +1 @@
+VITE_EVALUATION_FORM_URL=DHAMMANAVA_EVALUATION_FORM_URL

frontend/.gitignore

@@ -22,4 +22,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-.env.production
+!.env

frontend/src/components/search/SearchField.tsx

@@ -17,6 +17,7 @@ import { SearchIcon } from "@chakra-ui/icons";
 import { useState } from "react";
 import { searchService } from "../../service/search";
 import { SearchResultInterface } from "../../models/qa";
+import { SEARCH_STATUS, SEARCH_TYPE } from "../../constant";
 
 interface SearchOptions {
   key: string;
@@ -121,7 +122,7 @@ function SearchField({
     if (q) {
       query = q.question;
     }
-    const response = await searchService(query);
+    const response = await searchService(query,SEARCH_TYPE.DEFAULT,SEARCH_STATUS.CONFIRM);
 
     const tokens = [query, ...response.tokens];
 
@@ -151,6 +152,12 @@ function SearchField({
           </InputLeftElement>
           <AutoCompleteInput
             onChange={onChangeInputHandler}
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            onKeyDown={(e: any) => {
+              if (e.key === "Enter") {
+                onSelectInputHandle(e);
+              }
+            }}
             variant="search_bar"
             value={searchParam || ""}
             placeholder="ค้นหาเลย"

frontend/src/constant/index.ts

@@ -58,3 +58,14 @@ export const REQUEST_STATUS = {
   PENDING: "pending",
   REVIEWED: "reviewed",
 };
+
+export const SEARCH_STATUS = {
+  DRAFT : "draft",
+  CONFIRM : "confirm",
+  DEFAULT : "draft"
+}
+
+export const SEARCH_TYPE = {
+  TF_IDF: "tf_idf",
+  DEFAULT: "tf_idf"
+}

frontend/src/service/search/search.ts

@@ -2,20 +2,23 @@ import axios from "../axiosInstance";
 import { CreateCustomError } from "../error";
 import { DataItem, SearchResultInterface } from "../../models/qa";
 import { searchURL } from "../../constant/serviceURL";
+import { SEARCH_STATUS, SEARCH_TYPE } from "../../constant";
 /**
  * Performs a search query using the specified query string.
  *
  * @param {string} query - The search query string.
  * @param {string} searchType - Optional. The search type to use. Defaults to "tf_idf".
+ * @param {string} searchStatus - Optional. The search status to use. Defaults to "draft".
  * @return {Promise<SearchResultInterface>} - A promise that resolves with the search results.
  */
 export const searchService = async (
   query: string,
-  searchType: string = "tf_idf"
+  searchType: string = SEARCH_TYPE.DEFAULT,
+  searchStatus: string = SEARCH_STATUS.DEFAULT
 ): Promise<SearchResultInterface> => {
   try {
     const response = await axios.get(
-      `${searchURL}/search?query=${query}&searchType=${searchType}`
+      `${searchURL}/search?query=${query}&searchType=${searchType}&searchStatus=${searchStatus}`
     );
 
     const records: DataItem[] = response.data.results.map((item: DataItem) => {