Ml initialization

.github/workflows/publish-backend-docker.yml

@@ -25,7 +25,7 @@ jobs:
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: eldpswp99
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Build image
@@ -51,4 +51,4 @@ jobs:
           username: eldpswp99
           password: ${{ secrets.DOCKER_TOKEN }}
       - name: Docker compose up
-        run: SHA=${GITHUB_SHA} docker compose -f ~/docker-compose.yml up -d fooriend-backend
+        run: SHA=${GITHUB_SHA} docker compose -f ~/docker-compose.yml up -d

.github/workflows/test.yml

@@ -2,9 +2,11 @@ name: 테스트
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - "main"
   pull_request:
-    branches: [ "main" ]
+    branches:
+      - "main"
 
 jobs:
   test:

backend/package.json

@@ -32,6 +32,7 @@
     "@types/bcryptjs": "^2.4.5",
     "@types/jsonwebtoken": "^9.0.3",
     "@types/multer": "^1.4.8",
+    "axios": "^1.6.0",
     "bcryptjs": "^2.4.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",

backend/src/review/dtos/in-dtos/restaurant.dto.ts

@@ -4,6 +4,9 @@ export class RestaurantDto {
   @IsString()
   googleMapPlaceId: string;
 
+  @IsString()
+  name: string;
+
   @IsNumber()
   latitude: number;
 

backend/src/review/dtos/out-dtos/restaurant.dto.ts

@@ -5,11 +5,19 @@ export class RestaurantDto {
   private googleMapPlaceId: string;
   private longitude: number;
   private latitude: number;
+  private name: string;
 
-  constructor({ id, googleMapPlaceId, longitude, latitude }: RestaurantEntity) {
+  constructor({
+    id,
+    googleMapPlaceId,
+    longitude,
+    latitude,
+    name,
+  }: RestaurantEntity) {
     this.id = id;
     this.googleMapPlaceId = googleMapPlaceId;
     this.longitude = longitude;
     this.latitude = latitude;
+    this.name = name;
   }
 }

backend/src/review/ml-remote.ts

@@ -0,0 +1,19 @@
+import axios from 'axios';
+
+export async function getReceiptOcr(imageUrl: string) {
+  return (
+    await axios.post(`${process.env.ML_URL}ocr`, {
+      image_url: imageUrl,
+    })
+  ).data;
+}
+
+export async function getReviewIsPositive(review: string) {
+  return (
+    (
+      await axios.post(`${process.env.ML_URL}review`, {
+        review,
+      })
+    ).data['result'] === '긍정'
+  );
+}

backend/src/review/models/restaurant.entity.ts

@@ -13,6 +13,9 @@ export class RestaurantEntity extends IssuedAtMetaEntity {
   @Column({ type: 'float8' })
   longitude: number;
 
+  @Column({ type: 'varchar', default: '' })
+  name: string;
+
   @OneToMany(() => ReviewEntity, (review) => review.restaurant)
   reviews: ReviewEntity[];
 }

backend/src/review/models/review.entity.ts

@@ -18,6 +18,12 @@ export class ReviewEntity extends IssuedAtMetaEntity {
   @Column({ type: 'varchar' })
   content: string;
 
+  @Column({ type: 'boolean', default: false })
+  isPositive: boolean;
+
+  @Column('varchar', { array: true, default: [] })
+  menu: string[];
+
   get receiptImage() {
     return this.images.find((image) => image.isReceipt);
   }

backend/src/review/repositories/restaurant.repository.ts

@@ -6,7 +6,7 @@ import { RestaurantDto } from '../dtos/in-dtos/restaurant.dto';
 @CustomRepository(RestaurantEntity)
 export class RestaurantRepository extends Repository<RestaurantEntity> {
   async findOrCreate(data: RestaurantDto) {
-    const { googleMapPlaceId, longitude, latitude } = data;
+    const { googleMapPlaceId, longitude, latitude, name } = data;
     const restaurant = await this.findOne({
       where: { googleMapPlaceId },
     });
@@ -17,6 +17,7 @@ export class RestaurantRepository extends Repository<RestaurantEntity> {
       googleMapPlaceId,
       longitude,
       latitude,
+      name,
     }).save();
   }
 }

backend/src/review/review.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import { UserEntity } from '../user/models/user.entity';
 import { CreateReviewDto } from './dtos/in-dtos/createReview.dto';
 import { RestaurantRepository } from './repositories/restaurant.repository';
@@ -7,6 +7,7 @@ import { In } from 'typeorm';
 import { ReviewEntity } from './models/review.entity';
 import { ReviewAdjacentQueryDto } from './dtos/in-dtos/review-adjacent-query.dto';
 import { getDistance } from 'geolib';
+import { getReceiptOcr, getReviewIsPositive } from './ml-remote';
 import { RestaurantEntity } from './models/restaurant.entity';
 
 @Injectable()
@@ -29,15 +30,31 @@ export class ReviewService {
       id: In(imageIds.concat([receiptImageId ?? -1])),
     });
     const receiptImage = images.find((image) => image.id === receiptImageId);
+    let menu = [];
     if (receiptImage) {
       await receiptImage.markAsReceipt();
+      try {
+        const receiptData = await getReceiptOcr(receiptImage.url);
+        menu = receiptData['menu'];
+      } catch (e) {
+        throw new BadRequestException('잘못된 영수증입니다.');
+      }
+    }
+
+    let isPositive = false;
+    try {
+      isPositive = await getReviewIsPositive(content);
+    } catch (e) {
+      throw new BadRequestException('리뷰 분석 중 오류가 발생했습니다.');
     }
 
     return await ReviewEntity.create({
       content,
       user,
       restaurant,
       images,
+      isPositive,
+      menu,
     }).save();
   }