@yolo-croket-dev/amqp-access 0.7.359 → 0.7.361-beta.1

package/notification-service/amqp.notification-service.module.js

@@ -27,6 +27,7 @@ exports.AmqpNotificationServiceModule = AmqpNotificationServiceModule = __decora
             services_1.AmqpSendNotificationService,
             services_1.AmqpNotificationBulkSendService,
             services_1.AmqpAmplitudeCohortExportJobService,
+            services_1.AmqpNotificationCampaignService,
         ],
         exports: [
             amqp_notification_service_provider_1.NotifiactionServiceProvider,
@@ -39,6 +40,7 @@ exports.AmqpNotificationServiceModule = AmqpNotificationServiceModule = __decora
             services_1.AmqpSendNotificationService,
             services_1.AmqpNotificationBulkSendService,
             services_1.AmqpAmplitudeCohortExportJobService,
+            services_1.AmqpNotificationCampaignService,
         ],
     })
 ], AmqpNotificationServiceModule);

package/notification-service/dto/index.d.ts

@@ -3,3 +3,4 @@ export * from './app-bulk-push-log';
 export * from './notification';
 export * from './notification-bulk-send';
 export * from './amplitude-cohort-export-job';
+export * from './notification-campaign';

package/notification-service/dto/index.js

@@ -19,3 +19,4 @@ __exportStar(require("./app-bulk-push-log"), exports);
 __exportStar(require("./notification"), exports);
 __exportStar(require("./notification-bulk-send"), exports);
 __exportStar(require("./amplitude-cohort-export-job"), exports);
+__exportStar(require("./notification-campaign"), exports);

package/notification-service/dto/notification-campaign/index.d.ts

@@ -0,0 +1,50 @@
+import { NotificationCampaignMessage, NotificationCampaignStatus } from '@yolo-croket-dev/entity-v2';
+/**
+ * @author jun
+ * @description 시트에서 확정된 개인별 메시지 계약
+ * @process 경계 검증 후 notification-service에 전달
+ */
+export declare class NotificationCampaignMessagePayload implements NotificationCampaignMessage {
+    userId: string;
+    itemId: string;
+    couponCode: string;
+    pushTitle: string;
+    pushBody: string;
+    pushAppLink: string;
+    pushWebLink: string;
+    pushImage: string;
+}
+export declare class GetNotificationCampaignPayload {
+    campaignId: string;
+    afterUserId?: string;
+}
+export declare class RegisterNotificationCampaignPayload {
+    campaignId: string;
+    snapshotHash: string;
+    startsAt: string;
+    endsAt: string;
+    recipients: NotificationCampaignMessagePayload[];
+}
+export declare class SendNotificationCampaignPayload {
+    campaignId: string;
+    userId: string;
+    snapshotHash: string;
+}
+export interface NotificationCampaignRecipientResult {
+    userId: string;
+    itemId: string;
+    couponCode: string;
+    snapshotHash: string;
+    messageHash: string;
+    status: NotificationCampaignStatus;
+    reason: string;
+    providerRequestId?: string;
+    updatedAt: string;
+}
+export interface RegisterNotificationCampaignResult {
+    registered: number;
+}
+export interface GetNotificationCampaignResult {
+    recipients: NotificationCampaignRecipientResult[];
+    nextUserId?: string;
+}

package/notification-service/dto/notification-campaign/index.js

@@ -0,0 +1,119 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SendNotificationCampaignPayload = exports.RegisterNotificationCampaignPayload = exports.GetNotificationCampaignPayload = exports.NotificationCampaignMessagePayload = void 0;
+const class_transformer_1 = require("class-transformer");
+const class_validator_1 = require("class-validator");
+/**
+ * @author jun
+ * @description 시트에서 확정된 개인별 메시지 계약
+ * @process 경계 검증 후 notification-service에 전달
+ */
+class NotificationCampaignMessagePayload {
+}
+exports.NotificationCampaignMessagePayload = NotificationCampaignMessagePayload;
+__decorate([
+    (0, class_validator_1.IsMongoId)(),
+    __metadata("design:type", String)
+], NotificationCampaignMessagePayload.prototype, "userId", void 0);
+__decorate([
+    (0, class_validator_1.IsMongoId)(),
+    __metadata("design:type", String)
+], NotificationCampaignMessagePayload.prototype, "itemId", void 0);
+__decorate([
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.MinLength)(1),
+    (0, class_validator_1.MaxLength)(100),
+    __metadata("design:type", String)
+], NotificationCampaignMessagePayload.prototype, "couponCode", void 0);
+__decorate([
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.MinLength)(1),
+    (0, class_validator_1.MaxLength)(100),
+    __metadata("design:type", String)
+], NotificationCampaignMessagePayload.prototype, "pushTitle", void 0);
+__decorate([
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.MinLength)(1),
+    (0, class_validator_1.MaxLength)(500),
+    __metadata("design:type", String)
+], NotificationCampaignMessagePayload.prototype, "pushBody", void 0);
+__decorate([
+    (0, class_validator_1.Matches)(/^yeogoo:\/\//),
+    (0, class_validator_1.MaxLength)(1500),
+    __metadata("design:type", String)
+], NotificationCampaignMessagePayload.prototype, "pushAppLink", void 0);
+__decorate([
+    (0, class_validator_1.Matches)(/^https:\/\//),
+    (0, class_validator_1.MaxLength)(1500),
+    __metadata("design:type", String)
+], NotificationCampaignMessagePayload.prototype, "pushWebLink", void 0);
+__decorate([
+    (0, class_validator_1.Matches)(/^https:\/\//),
+    (0, class_validator_1.MaxLength)(1500),
+    __metadata("design:type", String)
+], NotificationCampaignMessagePayload.prototype, "pushImage", void 0);
+class GetNotificationCampaignPayload {
+}
+exports.GetNotificationCampaignPayload = GetNotificationCampaignPayload;
+__decorate([
+    (0, class_validator_1.Matches)(/^[a-z0-9][a-z0-9_-]{0,59}$/),
+    __metadata("design:type", String)
+], GetNotificationCampaignPayload.prototype, "campaignId", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsMongoId)(),
+    __metadata("design:type", String)
+], GetNotificationCampaignPayload.prototype, "afterUserId", void 0);
+class RegisterNotificationCampaignPayload {
+}
+exports.RegisterNotificationCampaignPayload = RegisterNotificationCampaignPayload;
+__decorate([
+    (0, class_validator_1.Matches)(/^[a-z0-9][a-z0-9_-]{0,59}$/),
+    __metadata("design:type", String)
+], RegisterNotificationCampaignPayload.prototype, "campaignId", void 0);
+__decorate([
+    (0, class_validator_1.Matches)(/^[a-f0-9]{64}$/),
+    __metadata("design:type", String)
+], RegisterNotificationCampaignPayload.prototype, "snapshotHash", void 0);
+__decorate([
+    (0, class_validator_1.IsISO8601)({ strict: true }),
+    (0, class_validator_1.Matches)(/(Z|[+-]\d{2}:\d{2})$/),
+    __metadata("design:type", String)
+], RegisterNotificationCampaignPayload.prototype, "startsAt", void 0);
+__decorate([
+    (0, class_validator_1.IsISO8601)({ strict: true }),
+    (0, class_validator_1.Matches)(/(Z|[+-]\d{2}:\d{2})$/),
+    __metadata("design:type", String)
+], RegisterNotificationCampaignPayload.prototype, "endsAt", void 0);
+__decorate([
+    (0, class_validator_1.IsArray)(),
+    (0, class_validator_1.ArrayMinSize)(1),
+    (0, class_validator_1.ArrayMaxSize)(100),
+    (0, class_validator_1.ValidateNested)({ each: true }),
+    (0, class_transformer_1.Type)(() => NotificationCampaignMessagePayload),
+    __metadata("design:type", Array)
+], RegisterNotificationCampaignPayload.prototype, "recipients", void 0);
+class SendNotificationCampaignPayload {
+}
+exports.SendNotificationCampaignPayload = SendNotificationCampaignPayload;
+__decorate([
+    (0, class_validator_1.Matches)(/^[a-z0-9][a-z0-9_-]{0,59}$/),
+    __metadata("design:type", String)
+], SendNotificationCampaignPayload.prototype, "campaignId", void 0);
+__decorate([
+    (0, class_validator_1.IsMongoId)(),
+    __metadata("design:type", String)
+], SendNotificationCampaignPayload.prototype, "userId", void 0);
+__decorate([
+    (0, class_validator_1.Matches)(/^[a-f0-9]{64}$/),
+    __metadata("design:type", String)
+], SendNotificationCampaignPayload.prototype, "snapshotHash", void 0);

package/notification-service/services/amqp.notification-campaign.service.d.ts

@@ -0,0 +1,15 @@
+import { ClientProxy } from '@nestjs/microservices';
+import { AbstractParam } from '@yolo-croket-dev/core';
+import { RegisterNotificationCampaignPayload, RegisterNotificationCampaignResult, SendNotificationCampaignPayload, NotificationCampaignRecipientResult, GetNotificationCampaignPayload, GetNotificationCampaignResult } from '../dto';
+/**
+ * @author jun
+ * @description 운영 스크립트의 저빈도 순차 요청용 RPC client
+ * @process 등록/수신자 한 명 실행/결과 페이지 조회; 재시도는 서버의 저장 상태로 차단
+ */
+export declare class AmqpNotificationCampaignService {
+    private readonly manager;
+    constructor(client: ClientProxy);
+    register(payload: RegisterNotificationCampaignPayload, param: AbstractParam): Promise<RegisterNotificationCampaignResult>;
+    send(payload: SendNotificationCampaignPayload, param: AbstractParam): Promise<NotificationCampaignRecipientResult>;
+    get(payload: GetNotificationCampaignPayload, param: AbstractParam): Promise<GetNotificationCampaignResult>;
+}

package/{user-service/services/amqp.signup-certification.service.js → notification-service/services/amqp.notification-campaign.service.js}

@@ -12,27 +12,32 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AmqpSignupCertificationService = void 0;
+exports.AmqpNotificationCampaignService = void 0;
 const common_1 = require("@nestjs/common");
 const microservices_1 = require("@nestjs/microservices");
 const functions_1 = require("@yolo-croket-dev/core/functions");
 /**
- * @author 홍준
- * @description 가입 전 본인인증 귀속 AMQP client
- * @process 가입 완료 후 로그인된 사용자에게 일회성 인증 결과를 연결한다.
+ * @author jun
+ * @description 운영 스크립트의 저빈도 순차 요청용 RPC client
+ * @process 등록/수신자 한 명 실행/결과 페이지 조회; 재시도는 서버의 저장 상태로 차단
  */
-let AmqpSignupCertificationService = class AmqpSignupCertificationService {
+let AmqpNotificationCampaignService = class AmqpNotificationCampaignService {
     constructor(client) {
-        this.client = client;
-        this.amqpManager = new functions_1.AmqpManagement(this.client);
+        this.manager = new functions_1.AmqpManagement(client);
     }
-    async claim(payload, param) {
-        return this.amqpManager.call('가입 전 본인인증 사용자 귀속', 'signup-certification.claim', payload, param, { isErrorThrowing: true });
+    register(payload, param) {
+        return this.manager.call('캠페인 등록', 'notification-campaign.register.recipients', payload, param, { isErrorThrowing: true });
+    }
+    send(payload, param) {
+        return this.manager.call('캠페인 수신자 발송', 'notification-campaign.send.recipient', payload, param, { isErrorThrowing: true });
+    }
+    get(payload, param) {
+        return this.manager.call('캠페인 결과 조회', 'notification-campaign.get.results', payload, param, { isErrorThrowing: true });
     }
 };
-exports.AmqpSignupCertificationService = AmqpSignupCertificationService;
-exports.AmqpSignupCertificationService = AmqpSignupCertificationService = __decorate([
+exports.AmqpNotificationCampaignService = AmqpNotificationCampaignService;
+exports.AmqpNotificationCampaignService = AmqpNotificationCampaignService = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, common_1.Inject)('USER_SERVICE_PROVIDER')),
+    __param(0, (0, common_1.Inject)('NOTIFICATION_SERVICE_PROVIDER')),
     __metadata("design:paramtypes", [microservices_1.ClientProxy])
-], AmqpSignupCertificationService);
+], AmqpNotificationCampaignService);

package/notification-service/services/index.d.ts

@@ -6,3 +6,4 @@ export * from './amqp.app-bulk-push.service';
 export * from './amqp.send-notification.service';
 export * from './amqp.notification-bulk-send.service';
 export * from './amqp.amplitude-cohort-export-job.service';
+export * from './amqp.notification-campaign.service';

package/notification-service/services/index.js

@@ -22,3 +22,4 @@ __exportStar(require("./amqp.app-bulk-push.service"), exports);
 __exportStar(require("./amqp.send-notification.service"), exports);
 __exportStar(require("./amqp.notification-bulk-send.service"), exports);
 __exportStar(require("./amqp.amplitude-cohort-export-job.service"), exports);
+__exportStar(require("./amqp.notification-campaign.service"), exports);

package/order-server/dto/purchasedinfos/query/get-p-info-additional-payment-info.dto.d.ts

@@ -6,4 +6,6 @@ export declare class GetPInfoAdditionalPaymentInfoResult {
     additionalPaymentItemImg: string;
     additionalPaymentItemPrice: number;
     additionalPaymentItemName: string;
+    /** 요청 생성 시 확정된 추가금 결제 기한. due date가 없는 과거 요청은 생략한다. */
+    additionalPaymentDueDate?: Date;
 }

package/order-server/services/amqp.purchased-info.service.d.ts

@@ -20,6 +20,7 @@ export declare class AmqpPurchasedInfoService {
     cancelDoneAdCenterCouponInfos(payload: CancelDoneAdCenterCouponInfosPayload, param: AbstractParam): Promise<void>;
     requestCreateAdCenterCouponSettle(payload: RequestCreateAdCenterCouponSettlePayload, param: AbstractParam): Promise<void>;
     patchProcessV2ToCheckingStock(payload: PatchProcessV2ToCheckingStockPayload, param: AbstractParam): Promise<PatchProcessV2ToCheckingStockResult>;
+    autoChangeAgreedSellerWaitingOrdersToCheckingStock(param: AbstractParam): Promise<void>;
     getItemSaleInfosForSalesTeamByAtlas(payload: GetItemSaleInfosForSalesTeamByAtlasPayload, param: AbstractParam): Promise<GetItemSaleInfosForSalesTeamByAtlasResult>;
     getItemSaleMergeDataForSalesTeamByAtlas(payload: GetItemSaleMergeDataForSalesTeamByAtlasPayload, param: AbstractParam): Promise<GetItemSaleMergeDataForSalesTeamByAtlasResult>;
     autoChangeWaitingReceive(payload: void, param: AbstractParam): Promise<void>;

package/order-server/services/amqp.purchased-info.service.js

@@ -66,6 +66,9 @@ let AmqpPurchasedInfoService = class AmqpPurchasedInfoService {
     async patchProcessV2ToCheckingStock(payload, param) {
         return this.amqpManager.call('셀러의 결제건들 재고확인중으로 변경', 'purchased-info.patch.process-v2-to-checking-stock', payload, param, { isErrorThrowing: true });
     }
+    async autoChangeAgreedSellerWaitingOrdersToCheckingStock(param) {
+        return this.amqpManager.call('사전 협의 셀러의 결제 5분 경과 주문을 재고확인중으로 변경', 'purchased-info.auto-change.agreed-seller-checking-stock', undefined, param, { isErrorThrowing: true });
+    }
     async getItemSaleInfosForSalesTeamByAtlas(payload, param) {
         return this.amqpManager.call('상품 판매 정보 결제 리스트 조회', 'purchased-info.get.item-sale-infos-for-sales-team-by-atlas', payload, param, { isErrorThrowing: true });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/amqp-access",
-  "version": "0.7.359",
+  "version": "0.7.361-beta.1",
   "main": "index.js",
   "author": "Yolo Co., Ltd.",
   "description": "크로켓 amqp-access npm",
@@ -20,12 +20,12 @@
     "@nestjs/common": "^10.3.10",
     "@nestjs/mapped-types": "2.0.2",
     "@yolo-croket-dev/core": "^1.9.3",
-    "@yolo-croket-dev/domain": "0.2.49",
+    "@yolo-croket-dev/domain": "0.2.50",
     "@yolo-croket-dev/dto-v2": "0.2.31",
     "@yolo-croket-dev/entity": "0.2.109",
-    "@yolo-croket-dev/entity-v2": "0.3.53",
+    "@yolo-croket-dev/entity-v2": "0.3.54-beta.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
     "dotenv": "^16.3.1"
   }
-}
+}

package/user-service/services/amqp.signup-certification.service.d.ts

@@ -1,14 +0,0 @@
-import { ClientProxy } from '@nestjs/microservices';
-import { AbstractParam } from '@yolo-croket-dev/core';
-import { ClaimSignupCertificationPayload, ClaimSignupCertificationResult } from '../dto/signup-certification';
-/**
- * @author 홍준
- * @description 가입 전 본인인증 귀속 AMQP client
- * @process 가입 완료 후 로그인된 사용자에게 일회성 인증 결과를 연결한다.
- */
-export declare class AmqpSignupCertificationService {
-    private readonly client;
-    private readonly amqpManager;
-    constructor(client: ClientProxy);
-    claim(payload: ClaimSignupCertificationPayload, param: AbstractParam): Promise<ClaimSignupCertificationResult>;
-}