Merge pull request #8 from cofinder-team/develop

release: v23.08.12

src/entities/index.ts

@@ -2,6 +2,7 @@ import { AlertTarget } from './alert/target.entity';
 import { Deal } from './deal.entity';
 import { Item } from './item.entity';
 import { ItemIpad } from './item/ipad.entity';
+import { ItemIphone } from './item/iphone.entity';
 import { ItemMacbook } from './item/macbook.entity';
 import { CoupangLog } from './log/coupang.entity';
 import { Model } from './model.entity';
@@ -14,6 +15,7 @@ export {
   Item,
   ItemMacbook,
   ItemIpad,
+  ItemIphone,
   Model,
   CoupangLog,
   User,

src/entities/item.entity.ts

@@ -12,6 +12,7 @@ import { Deal } from './deal.entity';
 import { AlertTarget } from './alert/target.entity';
 import { ItemMacbook } from './item/macbook.entity';
 import { ItemIpad } from './item/ipad.entity';
+import { ItemIphone } from './item/iphone.entity';
 
 @Entity({ schema: 'macguider', name: 'item' })
 export class Item extends BaseEntity {
@@ -35,6 +36,13 @@ export class Item extends BaseEntity {
   ])
   ipad: ItemIpad;
 
+  @OneToOne(() => ItemIphone, (ItemIphone) => ItemIphone.item)
+  @JoinColumn([
+    { name: 'type', referencedColumnName: 'type' },
+    { name: 'id', referencedColumnName: 'id' },
+  ])
+  iphone: ItemIphone;
+
   @OneToMany(() => Vendor, (vendor) => vendor.item)
   @JoinColumn([
     { name: 'type', referencedColumnName: 'type' },

src/entities/item/iphone.entity.ts

@@ -0,0 +1,27 @@
+import { Column, Entity, JoinColumn, ManyToOne, OneToOne } from 'typeorm';
+import { ItemDetailEntity } from './detall.entity';
+import { Model } from '../model.entity';
+import { Item } from '../item.entity';
+
+@Entity({ schema: 'macguider', name: 'item_iphone' })
+export class ItemIphone extends ItemDetailEntity {
+  @Column()
+  modelSuffix: string;
+
+  @Column()
+  phoneStorage: string;
+
+  @ManyToOne(() => Model, (model) => model.iphoneItems)
+  @JoinColumn([
+    { name: 'type', referencedColumnName: 'type' },
+    { name: 'model', referencedColumnName: 'id' },
+  ])
+  modelEntity: Model;
+
+  @OneToOne(() => Item, (item) => item.iphone)
+  @JoinColumn([
+    { name: 'type', referencedColumnName: 'type' },
+    { name: 'id', referencedColumnName: 'id' },
+  ])
+  item: Item;
+}

src/entities/model.entity.ts

@@ -1,6 +1,7 @@
 import { Column, Entity, JoinColumn, OneToMany, PrimaryColumn } from 'typeorm';
 import { ItemIpad } from './item/ipad.entity';
 import { ItemMacbook } from './item/macbook.entity';
+import { ItemIphone } from './item/iphone.entity';
 
 @Entity({ schema: 'macguider', name: 'model' })
 export class Model {
@@ -26,4 +27,11 @@ export class Model {
     { name: 'id', referencedColumnName: 'model' },
   ])
   ipadItems: ItemIpad[];
+
+  @OneToMany(() => ItemIphone, (iphoneItem) => iphoneItem.modelEntity)
+  @JoinColumn([
+    { name: 'type', referencedColumnName: 'type' },
+    { name: 'id', referencedColumnName: 'model' },
+  ])
+  iphoneItems: ItemIphone[];
 }

src/lib/alert/payload.ts

@@ -1,7 +1,7 @@
 import { AlertTarget, Deal, Item, PriceTrade } from '../../entities';
 
 const generateSpec = (item: Item): { main: string; detail: string } => {
-  const { macbook, ipad } = item;
+  const { macbook, ipad, iphone } = item;
 
   if (macbook) {
     const { modelEntity, chip, cpu, gpu, ram, ssd } = macbook;
@@ -23,6 +23,16 @@ const generateSpec = (item: Item): { main: string; detail: string } => {
     };
   }
 
+  if (iphone) {
+    const { modelEntity, modelSuffix, phoneStorage } = iphone;
+    const { name } = modelEntity;
+
+    return {
+      main: `${name} ${modelSuffix}`,
+      detail: `${phoneStorage}`,
+    };
+  }
+
   return { main: '', detail: '' };
 };
 

src/lib/relations/item.detail.relation.ts

@@ -0,0 +1,13 @@
+import { FindOptionsRelations } from 'typeorm';
+import { Item } from '../../entities';
+import { ItemDetailEntity } from '../../entities/item/detall.entity';
+
+const getItemDetailRelation = (
+  inner: FindOptionsRelations<ItemDetailEntity>,
+): FindOptionsRelations<Item> => ({
+  macbook: { ...inner },
+  ipad: { ...inner },
+  iphone: { ...inner },
+});
+
+export { getItemDetailRelation };

src/services/deal.service.ts

@@ -6,6 +6,7 @@ import {
   Repository,
 } from 'typeorm';
 import { Deal } from '../entities';
+import { getItemDetailRelation } from '../lib/relations/item.detail.relation';
 
 export class DealService {
   private dealRepository: Repository<Deal>;
@@ -17,7 +18,7 @@ export class DealService {
   async getTargetDeals() {
     const where: FindOptionsWhere<Deal> = { alertedAt: IsNull() };
     const relations: FindOptionsRelations<Deal> = {
-      item: { macbook: { modelEntity: {} }, ipad: { modelEntity: {} } },
+      item: getItemDetailRelation({ modelEntity: {} }),
     };
     return this.dealRepository.find({ where, relations });
   }