Merge branch 'main' of github.com:Apillon/nft-studio-simplet

Author: urko94

backend/src/config/values.ts

@@ -100,6 +100,8 @@ export enum ValidatorErrorCode {
   EMAIL_OR_WALLET_REQUIRED = 422014,
   DATA_MODEL_STATUS_MISSING = 422100,
   DATA_MODEL_INVALID_STATUS = 422101,
+  DUPLICATED_MAIL = 422102,
+  DUPLICATED_WALLET = 422103,
 }
 
 /**

backend/src/cron.ts

@@ -120,7 +120,10 @@ export class Cron {
                 apiUrl: env.APILLON_API_URL,
                 key: env.APILLON_KEY,
                 secret: env.APILLON_SECRET,
-                logLevel: LogLevel.VERBOSE,
+                logLevel:
+                  env.APP_ENV === 'production'
+                    ? LogLevel.ERROR
+                    : LogLevel.VERBOSE,
               }).collection(env.COLLECTION_UUID)
             : null;
 

backend/src/lib/claim.ts

@@ -10,7 +10,7 @@ export async function claim(user: User): Promise<string> {
     apiUrl: env.APILLON_API_URL,
     key: env.APILLON_KEY,
     secret: env.APILLON_SECRET,
-    logLevel: LogLevel.VERBOSE,
+    logLevel: env.APP_ENV === 'production' ? LogLevel.ERROR : LogLevel.VERBOSE,
   }).collection(env.COLLECTION_UUID);
 
   validateAirdropStatus(user.airdrop_status);

backend/src/lib/job.ts

@@ -96,7 +96,8 @@ const sendClaimEmails = async (job: JobType, mysql: MySql) => {
           apiUrl: env.APILLON_API_URL,
           key: env.APILLON_KEY,
           secret: env.APILLON_SECRET,
-          logLevel: LogLevel.VERBOSE,
+          logLevel:
+            env.APP_ENV === 'production' ? LogLevel.ERROR : LogLevel.VERBOSE,
         }).collection(env.COLLECTION_UUID)
       : null;
 
@@ -181,7 +182,7 @@ const sendClaimEmails = async (job: JobType, mysql: MySql) => {
       }
     }
 
-    writeLog(LogType.ERROR, updates);
+    writeLog(LogType.SQL, updates);
 
     if (updates.length > 0) {
       const sql = `

backend/src/lib/logger.ts

@@ -28,6 +28,11 @@ export function writeLog(
   functionSource = '',
   error?: Error,
 ) {
+  if (type === LogType.SQL && env.APP_ENV === 'production') {
+    // Do not log SQL queries in production
+    return;
+  }
+
   if (env.LOG_TARGET == 'console') {
     // setTheme({
     //   info: [bgYellow, black],

backend/src/lib/node-mailer.ts

@@ -98,7 +98,7 @@ export async function SmtpSendTemplate(
       senderName ? senderName : env.SMTP_NAME_FROM
     } <${
       senderEmail ? senderEmail : env.SMTP_EMAIL_FROM
-    }>" to "${mailAddresses.join(';')}"`,
+    }>" to ${mailAddresses.length} recipients.`,
     'node-mailer.ts',
     'SmtpSendTemplate',
   );

backend/src/middlewares/claim.ts

@@ -44,6 +44,6 @@ export function ClaimGuard(req: Request, _res: Response, next: NextFunction) {
       AuthorizationErrorCode.UNSUPPORTED_CLAIM_TYPE,
       context,
       `claim-middleware/validateRoute/${context.env.CLAIM_TYPE}`,
-      ),
+    ),
   );
 }

backend/src/middlewares/logger.ts

@@ -208,11 +208,11 @@ export class User extends BaseSqlModel {
       `
       SELECT 1
       FROM user
-      WHERE email <> @email
+      WHERE id <> @id
       AND wallet = @wallet;
     `,
       {
-        email: this.email,
+        id: this.id,
         wallet: this.wallet,
       },
     );

backend/src/models/user.ts

@@ -1,9 +1,9 @@
 import { Application } from 'express';
 import { NextFunction, Request, Response } from '../http';
-import { PopulateStrategy } from '../config/values';
+import { PopulateStrategy, ValidatorErrorCode } from '../config/values';
 import { AuthenticateAdmin } from '../middlewares/authentication';
 import { BatchUsers } from '../models/batch-users';
-import { ValidationError } from '../lib/errors';
+import { ResourceError, ValidationError } from '../lib/errors';
 
 /**
  * Installs new route on the provided application.
@@ -21,6 +21,30 @@ export function inject(app: Application) {
 
 export async function resolve(req: Request, res: Response): Promise<void> {
   const { context, body } = req;
+
+  const usersToCreate = body.users;
+
+  const emailSet = new Set<string>();
+  const walletSet = new Set<string>();
+
+  for (const user of usersToCreate) {
+    const { email, wallet } = user;
+
+    if (email && emailSet.has(email)) {
+      throw new ResourceError(ValidatorErrorCode.DUPLICATED_MAIL);
+    }
+    if (wallet && walletSet.has(wallet)) {
+      throw new ResourceError(ValidatorErrorCode.DUPLICATED_WALLET);
+    }
+
+    if (email) {
+      emailSet.add(email);
+    }
+    if (wallet) {
+      walletSet.add(wallet);
+    }
+  }
+
   const users = new BatchUsers({}, context).populate(
     body,
     PopulateStrategy.ADMIN,