Merge remote-tracking branch 'origin/main' into feature/add_logger_st…

…ack_trace

# Conflicts:
#	src/module/payment/data/payment.db.ts
#	src/module/payment/data/payment.entity.ts

package.json

@@ -43,7 +43,7 @@
     "fastify-swagger": "^5.2.0",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.43",
-    "mysql2": "^3.4.1",
+    "mysql2": "^3.5.2",
     "nest-winston": "^1.9.3",
     "passport": "^0.6.0",
     "passport-jwt": "^4.0.1",

src/module/payment/api/payment.controller.ts

@@ -9,7 +9,7 @@ import { RefundPaymentInfo } from '../domain/payment.model';
 import { JwtAuthGuard } from '../../auth/auth.jwtAuthGuard';
 
 //@UseGuards(AuthGuard)
-@Controller('api/payment')
+@Controller('/payment')
 export class PaymentController {
   constructor(private readonly paymentService: PaymentService) {}
 

src/module/payment/data/payment.db.ts

@@ -15,19 +15,24 @@ import { UserEntity } from 'src/module/user/data/user.entity';
 // 실제 DB
 @Injectable()
 export class PaymentRepositoryImpl implements PaymentRepository {
-  constructor(
-    // DB 주입
-    @InjectRepository(PaymentEntity)
-    private PaymentDB: Repository<PaymentEntity>,
-    private UserDB: Repository<UserEntity>,
-  ) {}
-
-  async savePayment(paymentInfo: PaymentInfo): Promise<Payment> {
-    // user가 db에 존재하는지??
-    const user = await this.UserDB.findOne({
-      where: { id: paymentInfo.userId },
-    });
-    if (user === null) throw new InvalidPaymentInfoError('유저');
+
+    constructor(
+        // DB 주입
+        @InjectRepository(PaymentEntity)
+        private PaymentDB: Repository<PaymentEntity>,
+        @InjectRepository(UserEntity)
+        private UserDB: Repository<UserEntity>
+    ){}
+
+    async savePayment(paymentInfo: PaymentInfo): Promise<Payment> {
+
+        console.log("paymentInfo : " + paymentInfo);
+
+        // user가 db에 존재하는지??
+        const user = await this.UserDB.findOne({
+            where: { id: paymentInfo.userId },
+        });
+        if (user === null) throw new InvalidPaymentInfoError('유저');
 
     // model -> entitiy
     const entity = this.PaymentDB.create({
@@ -73,15 +78,15 @@ export class PaymentRepositoryImpl implements PaymentRepository {
     payment.isRefund = true; // 원하는 칼럼을 true로 변경
     await this.PaymentDB.save(payment); // 변경 내용을 저장
 
-    // entitiy -> domain
-    const refundPaymentDomain: PaymentInfoForRefund = {
-      userId: payment.User.id,
-      cardNum: payment.cardNum,
-      endDate: payment.endDate,
-      cvc: payment.cvc,
-      cardCompany: payment.cardCompany,
-      price: payment.price,
-    };
+        // entitiy -> domain
+        const refundPaymentDomain: PaymentInfoForRefund = {
+            userId: user.id,
+            cardNum: payment.cardNum,
+            endDate: payment.endDate,
+            cvc: payment.cvc,
+            cardCompany: payment.cardCompany,
+            price: payment.price,
+          };
 
     return refundPaymentDomain;
   }

src/module/payment/data/payment.entity.ts

@@ -12,18 +12,19 @@ export class PaymentEntity {
   @PrimaryGeneratedColumn({ type: 'int', name: 'id' })
   id: number;
 
-  @ManyToOne(() => UserEntity, (User) => User.PaymentEntity)
-  @JoinColumn([{ name: 'userId', referencedColumnName: 'id' }])
-  User: UserEntity;
+  @ManyToOne( () => UserEntity, (User) => User.PaymentEntity )
+  @JoinColumn([{name: 'userId', referencedColumnName: 'id'}])
+
+  User: UserEntity | null; // nullable로 변경
   //@JoinColumn([{ name: 'userId', referencedColumnName: 'id' }])
 
-  @Column('int', { name: 'card_num' })
+  @Column('int', { name: 'card_num', nullable: true  })
   cardNum: number;
 
-  @Column('varchar', { name: 'end_date', length: 45 })
+  @Column('varchar', { name: 'end_date', length: 45, nullable: true  })
   endDate: string;
 
-  @Column('int', { name: 'cvc' })
+  @Column('int', { name: 'cvc', nullable: true  })
   cvc: number;
 
   @Column('enum', {
@@ -38,6 +39,7 @@ export class PaymentEntity {
       'hyundai',
       'nonghyup',
     ],
+    nullable: true
   })
   cardCompany:
     | 'kookmin'
@@ -49,9 +51,9 @@ export class PaymentEntity {
     | 'hyundai'
     | 'nonghyup';
 
-  @Column('int', { name: 'price' })
+  @Column('int', { name: 'price', nullable: true  })
   price: number;
-
-  @Column('boolean', { name: 'is_refund' })
+  
+  @Column("boolean", { name: "is_refund", nullable: false, default: 0  })
   isRefund: boolean;
 }

src/module/payment/domain/payment.repository.ts

@@ -15,6 +15,7 @@ export class TestPaymentRepository implements PaymentRepository {
   async savePayment(paymentInfo: PaymentInfo): Promise<Payment> {
     this.paymentInfos.push(paymentInfo);
 
+
     return {
       paymentId: 1,
       userId: 1,
@@ -38,6 +39,7 @@ export class TestPaymentRepository implements PaymentRepository {
       price: 10000,
     };
   }
+
   async findUserPhoneNumber(userId: number): Promise<string> {
     return '12341234';
   }

src/module/payment/domain/payment.service.ts

@@ -12,10 +12,11 @@ import { AlarmData } from 'src/module/alarm/alarm.service';
 
 @Injectable() // 비즈니스 로직으로 분리
 export class PaymentService {
+
   constructor(
-    @Inject('PaymentService')
+    @Inject('PaymentRepository')
     private readonly repository: PaymentRepository,
-    @Inject('PaymentService')
+    @Inject('AlarmService')
     private readonly alarmService: AlarmService,
   ) {}
 

src/module/payment/output/ormconfig.json

@@ -6,7 +6,7 @@
     "port": 3306,
     "username": "root",
     "password": "skl035512!",
-    "database": "",
+    "database": "animalnest",
     "synchronize": false,
     "entities": ["entities/*.js"]
   }

src/module/payment/payment.module.ts

@@ -9,28 +9,33 @@ import { PaymentRepositoryImpl } from './data/payment.db';
 import { AlarmService, AlarmServiceImpl } from '../alarm/alarm.service';
 import { AlarmModule } from '../alarm/alarm.module';
 import { AuthModule } from '../auth/auth.module';
+import { UserEntity } from '../user/data/user.entity';
 
 @Module({
-  imports: [AuthModule, TypeOrmModule.forFeature([PaymentEntity]), AlarmModule],
+  imports: [
+    AuthModule,
+    TypeOrmModule.forFeature([PaymentEntity,UserEntity]),
+    AlarmModule
+  ],
   controllers: [PaymentController],
   providers: [
     PaymentService,
     {
-      provide: 'PaymentService',
+      provide: 'PaymentRepository',
       useClass: PaymentRepositoryImpl,
     },
     {
-      provide: 'PaymentService',
+      provide: 'AlarmService',
       useClass: AlarmServiceImpl,
     },
   ],
   exports: [
     {
-      provide: 'PaymentService',
+      provide: 'PaymentRepository',
       useClass: PaymentRepositoryImpl,
     },
     {
-      provide: 'PaymentService',
+      provide: 'AlarmService',
       useClass: AlarmServiceImpl,
     },
   ],