Merge branch 'main' of github.com:Vitruveo/vtru-studio-api into main

package.json

@@ -1,6 +1,6 @@
 {
     "name": "vtru-studio-api",
-    "version": "1.0.582",
+    "version": "1.0.601",
     "description": "",
     "main": "index.js",
     "scripts": {

src/constants/rabbitmq.ts

@@ -17,3 +17,6 @@ export const RABBITMQ_ERROR_TIMEOUT_BEFORE_EXIT = process.env
     .RABBITMQ_ERROR_TIMEOUT_BEFORE_EXIT
     ? parseInt(process.env.RABBITMQ_ERROR_TIMEOUT_BEFORE_EXIT, 10)
     : 5000;
+export const RABBITMQ_EXCHANGE_UPDATE_USERNAME_IN_ASSETS =
+    process.env.RABBITMQ_EXCHANGE_UPDATE_CREATOR_USERNAME_IN_ASSETS ||
+    'updateCreatorUsernameInAssets';

src/features/assets/controller/core.ts

@@ -8,6 +8,7 @@ import { Request, Router } from 'express';
 
 import * as model from '../model';
 import * as modelRequestConsign from '../../requestConsign/model';
+import * as modelCreator from '../../creators/model';
 import { middleware } from '../../users';
 import {
     APIResponse,
@@ -273,6 +274,7 @@ route.post('/', validateBodyForCreate, async (req, res) => {
             assetMetadata: model.AssetsDocument['assetMetadata'];
             licenses: model.AssetsDocument['licenses'];
             terms: model.AssetsDocument['terms'];
+            creator: model.AssetsDocument['creator'];
         } | null = null;
 
         if (req.body.cloneId) {
@@ -287,6 +289,13 @@ route.post('/', validateBodyForCreate, async (req, res) => {
                     asset.actions.countClone = 0;
                 }
 
+                if (!asset?.creator) {
+                    const creator = await modelCreator.findCreatorById({
+                        id: req.auth.id,
+                    });
+                    asset.creator = { username: creator?.username || '' };
+                }
+
                 asset.actions.countClone += 1;
 
                 await model.updateAssets({
@@ -298,6 +307,7 @@ route.post('/', validateBodyForCreate, async (req, res) => {
                     assetMetadata: asset?.assetMetadata,
                     licenses: asset?.licenses,
                     terms: asset?.terms,
+                    creator: asset?.creator,
                 };
                 clone.assetMetadata.context.formData.title += ` ${asset.actions.countClone}`;
                 clone.licenses.print.added = false;

src/features/assets/controller/rules.ts

@@ -26,6 +26,7 @@ import {
     schemaAssetUpdateManyNudity,
 } from './schemas';
 import { schemaValidationForPatchAssetPrice } from './schemaValidate';
+import { model } from '../../creators';
 
 export const validateBodyForCreate = async (
     req: Request,
@@ -47,6 +48,11 @@ export const validateBodyForCreate = async (
         req.body.framework = createRecordFramework({
             createdBy: req.auth.id,
         });
+
+        const creator = await model.findCreatorById({ id: req.auth.id });
+        req.body.creator = {
+            username: creator?.username || '',
+        };
         next();
     } catch (error) {
         res.status(400).json({

src/features/assets/controller/types.ts

@@ -88,6 +88,10 @@ export interface Spotlight {
     preview: string;
     author: string;
     nudity: string;
+    vault: {
+        transactionhash: string | null;
+        vaultAddress: string | null;
+    };
 }
 
 export interface ArtistSpotlight {

src/features/assets/model/db.ts

@@ -29,6 +29,7 @@ import type {
     UpdateManyAssetSpotlightParams,
     FindMyAssetsParams,
     CountArtsByCreatorParams,
+    UpateAssetsUsernameParams,
 } from './types';
 import { FindOptions, getDb, ObjectId } from '../../../services/mongo';
 import { buildFilterColorsQuery } from '../utils/color';
@@ -219,7 +220,7 @@ export const findAssetGroupPaginated = ({
         },
         {
             $addFields: {
-                username: '$creator.username',
+                vault: '$creator.vault',
             },
         },
         {
@@ -319,23 +320,23 @@ export const findAssetsPaginated = ({
                 from: 'creators',
                 localField: 'creatorId',
                 foreignField: '_id',
-                as: 'creator',
+                as: 'creatorDetails',
             },
         },
         {
             $unwind: {
-                path: '$creator',
+                path: '$creatorDetails',
             },
         },
         {
             $addFields: {
-                username: '$creator.username',
+                vault: '$creatorDetails.vault',
             },
         },
         {
             $project: {
                 creatorId: 0,
-                creator: 0,
+                creatorDetails: 0,
             },
         },
         { $sort: sort },
@@ -1037,6 +1038,7 @@ export const findLastSoldAssets = () =>
                     preview: '$formats.preview.path',
                     price: '$licenses.nft.single.editionPrice',
                     username: '$creator.username',
+                    vault: '$creator.vault',
                 },
             },
         ])
@@ -1197,6 +1199,7 @@ export const findAssetsForSpotlight = ({
                     preview: '$asset.formats.preview.path',
                     username: '$creator.username',
                     nudity: '$asset.assetMetadata.taxonomy.formData.nudity',
+                    vault: '$creator.vault',
                 },
             },
         ])
@@ -1235,3 +1238,12 @@ export const getTotalPrice = async (query = {}) =>
 
 export const countArtsByCreator = async ({ query }: CountArtsByCreatorParams) =>
     assets().countDocuments(query);
+
+export const updateAssetsUsername = async ({
+    data,
+    username,
+}: UpateAssetsUsernameParams) =>
+    assets().updateMany(
+        { _id: { $in: data.map((item) => new ObjectId(item._id)) } },
+        { $set: { 'creator.username': username } }
+    );

src/features/assets/model/schema.ts

@@ -211,6 +211,9 @@ export const AssetsSchema = z.object({
             updatedBy: z.string().nullable().default(null),
         })
         .default({}),
+    creator: z.object({
+        username: z.string().default(''),
+    }),
 });
 
 export type Assets = z.infer<typeof AssetsSchema>;

src/features/assets/model/types.ts

@@ -163,3 +163,8 @@ export interface FindAssetsForSpotlightParams {
 export interface CountArtsByCreatorParams {
     query: any;
 }
+
+export interface UpateAssetsUsernameParams {
+    data: AssetsDocument[];
+    username: string;
+}

src/features/assets/utils/queries.ts

@@ -56,6 +56,12 @@ export const queryByTitleOrDescOrCreator = ({
             },
         },
     },
+    {
+        'creator.username': {
+            $regex: name,
+            $options: 'i',
+        },
+    },
 ];
 export interface querySortSearchParams {
     order: string;

src/features/creators/index.ts

@@ -1,5 +1,6 @@
 import * as model from './model';
 import * as controller from './controller';
 import * as watcher from './watcher';
+import * as queue from './queue';
 
-export { model, controller, watcher };
+export { model, controller, watcher, queue };

src/features/creators/model/db.ts

@@ -16,7 +16,7 @@ import type {
     updateCreatorSearchVideoParams,
     UpdateCreatorSocialById,
     RemoveCreatorSocialById,
-    PpdateCreatorSearchGridParams,
+    UpdateCreatorSearchGridParams,
     FindCreatorAssetsByGridId,
     FindCreatorAssetsByVideoId,
     FindCreatorAssetsBySlideshowId,
@@ -31,6 +31,7 @@ import type {
     ChangeStepsSynapsParams,
     SynapsSessionInitParams,
     ChangeTruLevelParams,
+    CheckHashAlreadyExistsParams,
 } from './types';
 import { getDb, ObjectId } from '../../../services/mongo';
 
@@ -213,14 +214,16 @@ export const updateCreatorSocialById = ({
 export const updateCreatorSearchGrid = ({
     id,
     grid,
-}: PpdateCreatorSearchGridParams) =>
+    hash,
+}: UpdateCreatorSearchGridParams) =>
     creators().updateOne(
         { _id: new ObjectId(id) },
         {
             $push: {
                 'search.grid': {
                     ...grid,
                     createdAt: new Date(),
+                    hash,
                 },
             },
         }
@@ -351,6 +354,7 @@ export const findCreatorsStacks = async ({
             $project: {
                 _id: 1,
                 username: 1,
+                vault: 1,
                 stacks: {
                     $reduce: {
                         input: inputReducer,
@@ -732,3 +736,14 @@ export const changeTruLevel = async ({
 
     return result;
 };
+
+export const checkHashAlreadyExists = async ({
+    hash,
+}: CheckHashAlreadyExistsParams) =>
+    creators()
+        .aggregate([
+            {
+                $match: { 'search.grid.hash': hash },
+            },
+        ])
+        .toArray();

src/features/creators/model/types.ts

@@ -123,7 +123,7 @@ export interface FindCreatorsByName {
     name: string;
 }
 
-export interface PpdateCreatorSearchGridParams {
+export interface UpdateCreatorSearchGridParams {
     id: string;
     grid: {
         id: string;
@@ -133,6 +133,7 @@ export interface PpdateCreatorSearchGridParams {
         title: string;
         description: string;
     };
+    hash: string;
 }
 
 export interface UpdateCreatorSearchSlideshowParams {
@@ -201,3 +202,6 @@ export interface SynapsSessionInitParams {
     sessionId: string;
     creatorId: string;
 }
+export interface CheckHashAlreadyExistsParams {
+    hash: string;
+}

src/features/creators/queue/index.ts

@@ -0,0 +1,14 @@
+import { uniqueExecution } from '@nsfilho/unique';
+import debug from 'debug';
+
+import { startQueueUpdateUsernameInAssets } from './read';
+
+const logger = debug('features:creators:queue');
+
+uniqueExecution({
+    name: 'startQueueUpdateUsernameInAssets',
+    callback: () =>
+        startQueueUpdateUsernameInAssets().catch((error) => {
+            logger('Error startQueueUpdateUsernameInAssets', error);
+        }),
+});