Merge branch 'develop' into feat/#110

ars/docker-compose.dev.yaml

@@ -2,17 +2,14 @@ version: '3.3'
 
 services:
   my_backend:
-    platform: linux/x86_64
-    image: asia.gcr.io/artiful-a1/my_backend:1.9
     build:
       context: .
       dockerfile: Dockerfile
-    env_file:
-      - ./.env.dev
     ports:
       - 3000:3000
     volumes:
       - ./src:/myfolder/src
+      - ./.env:/myfolder/.env
 
   my_database:
     platform: linux/x86_64

ars/src/apis/art/art.resolver.ts

@@ -199,7 +199,7 @@ export class ArtResolver {
       });
       return artTags;
     }
-  }
+
 
   @Query(() => Art)
   async fetchArt(@Args('artId') artId: string) {
@@ -210,6 +210,7 @@ export class ArtResolver {
   async fetchArtImages(@Args('artId') artId: string) {
     return await this.artService.findImages({ artId });
   }
+
   ///////////////////////////////////////////////////////////////////////////
   @UseGuards(GqlAuthAccessGuard)
   @Query(() => Number)
@@ -316,7 +317,7 @@ export class ArtResolver {
   @UseGuards(GqlAuthAccessGuard)
   @Query(() => [Art])
   async fetchLikeArt(
-    @Args('page') page: number,
+    @Args('page', { nullable: true }) page: number,
     @CurrentUser() currentUser: ICurrentUser,
   ) {
     return await this.likeArtService.find(currentUser.id, page);

ars/src/apis/auth/auth.service.ts

@@ -22,7 +22,7 @@ export class AuthService {
       { email: user.email, sub: user.id },
       { secret: process.env.REFRESH_TOKEN_KEY, expiresIn: '8h' },
     );
-    res.setHeader('Access-Control-Allow-Origin', 'http://localhost:3000');
+    res.setHeader('Access-Control-Allow-Origin', 'https://artipul.shop');
     res.setHeader(
       'Set-Cookie',
       `refreshToken=${refreshToken}; path=/; domain=.daseul.shop; SameSite=None; Secure;httpOnly;`,
@@ -38,10 +38,11 @@ export class AuthService {
       const createUser = { ...rest, password: hashedPassword };
       user = await this.userService.create({ ...createUser });
       this.setRefreshToken({ user, res });
-      res.redirect('http://localhost:3000/socialLogin');
+      res.redirect('https://artipul.shop/socialLogin');
     } else {
       this.setRefreshToken({ user, res });
-      res.redirect('http://localhost:3000');
+      res.redirect('https://artipul.shop/');
+      res.send(user);
     }
   }
 }

ars/src/apis/likeArt/likeArt.service.ts

@@ -11,11 +11,17 @@ export class LikeArtService {
   ) {}
 
   async find(userId, page) {
-    const arts = await this.likeArtRepository.find({
-      take: 10,
-      skip: 10 * (page - 1),
-      where: { userId: userId },
-    });
+    let arts = [];
+    if (page) {
+      arts = await this.likeArtRepository.find({
+        take: 10,
+        skip: 10 * (page - 1),
+        where: { userId: userId },
+      });
+    } else {
+      arts = await this.likeArtRepository.find({ userId });
+    }
+
     return arts.map((ele) => ele.art);
   }
 

ars/src/apis/payment/payment.resolver.ts

@@ -22,9 +22,9 @@ export class PaymentResolver {
       const arts = await this.paymentService.checkTimeout();
       arts.map(async (e) => {
         const bidInfo = await this.cacheManager.get(e.id);
-        const price = bidInfo[0];
-        const bidder = await this.userService.findOne(bidInfo[1]);
-        if (price) {
+        if (bidInfo) {
+          const price = bidInfo[0];
+          const bidder = await this.userService.findOne(bidInfo[1]);
           await this.paymentService.successfulBid(e.id, price, bidder, e.user);
         } else {
           await this.paymentService.failedBid(e.id);

ars/src/apis/payment/payment.service.ts

@@ -28,12 +28,9 @@ export class PaymentService {
 
   // 마감된 작품 체크
   async checkTimeout() {
-    const time = new Date();
-    const yyyy = time.getFullYear();
-    const mm = time.getMonth() + 1;
-    const dd = time.getDate();
-    const currentTime = `${yyyy}-${mm}-${dd}`;
-
+    const utc = new Date();
+    const KR_TIME_DIFF = 9 * 60 * 60 * 1000;
+    const currentTime = new Date(Number(utc) + Number(KR_TIME_DIFF));
     console.log(currentTime, ' 현 재 시 간 ');
     return await this.artRepository.find({
       where: {
@@ -104,7 +101,11 @@ export class PaymentService {
   // 입찰
   async call(artId, bid_price, email) {
     const art = await this.artRepository.findOne(artId);
-    const time = Number(art.deadline) - Number(new Date());
+
+    const utc = new Date();
+    const KR_TIME_DIFF = 9 * 60 * 60 * 1000;
+    const currentTime = new Date(Number(utc) + Number(KR_TIME_DIFF));
+    const time = Number(art.deadline) - Number(currentTime);
     if (time > 0) {
       await this.cacheManager.set(artId, [bid_price, email], {
         ttl: time + 60000,

ars/src/apis/user/user.resolver.ts

@@ -23,6 +23,11 @@ export class UserResolver {
     return await this.userService.findUserEmail({ phoneNum });
   }
 
+  @Query(() => String)
+  async findSocialUser(@Args('email') email: string) {
+    const user = await this.userService.findOne(email);
+  }
+
   @Mutation(() => User)
   async createUser(@Args('createUserInput') createUserInput: CreateUserInput) {
     const { password, ...rest } = createUserInput;

ars/src/common/graphql/schema.gql

@@ -148,7 +148,7 @@ type Query {
   fetchTransactionCompletedArts(page: Float!): [Art!]!
   fetchEngaging(page: Float!): [Engage!]!
   fetchArtistWorks(artId: String!): [Art!]!
-  fetchLikeArt(page: Float!): [Art!]!
+  fetchLikeArt(page: Float): [Art!]!
   fetchBoard(boardId: String!): Board!
   fetchBoardImgaes(boardId: String!): [BoardImage!]!
   fetchBoards: [Board!]!
@@ -163,6 +163,7 @@ type Query {
   fetchArtistProfile(artId: String!): Profile!
   fetchUser: User!
   findUserEmail(phoneNum: String!): String!
+  findSocialUser(email: String!): String!
   fetchPointTransactions: [PointTransaction!]!
 }