Skip to content

chore: ShopsService 메서드 수정 #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2023
Merged

chore: ShopsService 메서드 수정 #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions src/apis/shops/shops.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,11 @@ import {
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { Shop } from './entities/shop.entity';
import { ShopImagesService } from '../shopImages/shopImage.service';
import {
IShopsServiceCreate,
IShopsServiceDelete,
IShopsServiceFindByAddress,
IShopsServiceFindById,
IShopsServiceFindByPhone,
IShopsServiceFindDeleted,
IShopsServiceGetLatLngByAddress,
IShopsServiceRestore,
IShopsServiceUpdate,
} from './interface/shops-service.interface';
import axios from 'axios';
Expand Down Expand Up @@ -45,7 +40,13 @@ export class ShopsService {
// DB의 모든 가게 정보 불러오기 + 페이징 추가
async findAll({ page, count }): Promise<Shop[]> {
const allShops = await this.shopsRepository.find({
relations: ['reservation', 'image', 'review'],
relations: [
'reservation',
'image',
'review',
'reservation.review',
'reservation.user',
],
skip: (page - 1) * count,
take: count,
});
Expand Down Expand Up @@ -111,29 +112,32 @@ export class ShopsService {

// 가게 신규 생성
async create({ createShopInput }: IShopsServiceCreate): Promise<Shop> {
const _address = createShopInput.address;
const { address } = createShopInput;
const checkShop = await this.shopsRepository.findOne({
where: { address: _address },
where: { address },
});

if (checkShop) {
throw new ConflictException(
`해당 주소(${_address})로 등록된 가게가 있습니다`,
`주소 ${address}로 등록된 가게가 이미 있습니다`,
);
}

// 구지역을 코드로 뽑기 위한 로직
const district = _address.split(' ')[1];
const code = await districtCode({ district });
// 지역구를 지역코드로 변환하기
const district = address.split(' ')[1];
const code = districtCode({ district });

const [lat, lng] = await this.getLatLngByAddress({ address: _address });
// 주소에 대한 위도, 경도 가져오기
const [lat, lng] = await this.getLatLngByAddress({ address });

return await this.shopsRepository.save({
const result = await this.shopsRepository.save({
...createShopInput,
lat,
lng,
code,
});

return result;
}

async getLatLngByAddress({
Expand Down Expand Up @@ -165,15 +169,13 @@ export class ShopsService {

if (!checkShop) {
throw new UnprocessableEntityException(
`ID가 ${shopId}인 가게를 찾을 수 없습니다`,
`id가 ${shopId}인 가게를 찾을 수 없습니다`,
);
}

const myShop = await this.findById({ shopId });
const _averageStar = myShop.averageStar === 0 ? null : myShop.averageStar;
console.log(myShop);

const result = this.shopsRepository.save({
const result = await this.shopsRepository.save({
...myShop,
...updateShopInput,
averageStar: _averageStar,
Expand All @@ -190,7 +192,7 @@ export class ShopsService {

if (!checkShop) {
throw new UnprocessableEntityException(
`삭제된 목록에서 ID가 ${shopId}인 가게를 찾을 수 없습니다`,
`id가 ${shopId}인 가게를 찾을 수 없습니다`,
);
}

Expand Down