@armi-wave/common 1.23.11 → 1.23.13

package/build/middlewares/current-user.d.ts

@@ -1,8 +1,9 @@
 import { NextFunction, Request, Response } from 'express';
+import mongoose from 'mongoose';
 interface UserPayload {
-    id: string;
-    email: string;
+    id: mongoose.Types.ObjectId;
     username: string;
+    profilePicUrl: string;
 }
 declare global {
     namespace Express {

package/build/models/Comment.d.ts

@@ -1,28 +1,19 @@
-import mongoose from 'mongoose';
-interface CommentAttributes {
-    postId: string;
-    userId: string;
+import mongoose, { Document } from 'mongoose';
+interface Comment extends Document {
+    postId: mongoose.Types.ObjectId;
+    userId: mongoose.Types.ObjectId;
     username: string;
+    profilePicUrl: string;
+    text: string;
     likes?: number;
     upVotes?: number;
     downVotes?: number;
-    reportNr?: number;
+    reportsNr?: number;
     replyNr?: number;
-    text: string;
-}
-interface CommentModel extends mongoose.Model<CommentDocument> {
-    build(attrs: CommentAttributes): CommentDocument;
+    createdAt: Date;
 }
-interface CommentDocument extends mongoose.Document {
-    postId: string;
-    userId: string;
-    username: string;
-    likes: number;
-    upVotes: number;
-    downVotes: number;
-    reportNr: number;
-    replyNr: number;
-    text: string;
+interface CommentModel extends mongoose.Model<Comment> {
+    build(attrs: Comment): Comment;
 }
 declare const Comment: CommentModel;
 export default Comment;

package/build/models/Comment.js

@@ -1,31 +1,73 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-const mongoose_1 = __importDefault(require("mongoose"));
-const commentSchema = new mongoose_1.default.Schema({
-    postId: { type: String, required: true },
-    userId: { type: String, required: true },
+const mongoose_1 = __importStar(require("mongoose"));
+const commentSchema = new mongoose_1.Schema({
+    postId: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: 'Post',
+        required: true,
+        index: true,
+    },
+    userId: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true,
+    },
     username: { type: String, required: true },
+    profilePicUrl: { type: String, default: '' },
+    text: { type: String, required: true },
     likes: { type: Number, required: false, default: 0 },
     upVotes: { type: Number, required: false, default: 0 },
     downVotes: { type: Number, required: false, default: 0 },
-    reportNr: { type: Number, required: false, default: 0 },
+    reportsNr: { type: Number, required: false, default: 0 },
     replyNr: { type: Number, required: false, default: 0 },
-    text: { type: String, required: true },
+    createdAt: { type: Date, default: Date.now },
 }, {
     toJSON: {
         transform(doc, ret) {
             ret.id = ret._id;
             delete ret.__v;
             delete ret._id;
-            delete ret.reportNr;
+            delete ret.reportsNr;
         },
     },
 });
 commentSchema.statics.build = (attrs) => {
     return new Comment(attrs);
 };
+commentSchema.index({ postId: 1 });
 const Comment = mongoose_1.default.model('Comment', commentSchema);
 exports.default = Comment;

package/build/models/Post.d.ts

@@ -1,31 +1,20 @@
-import mongoose from 'mongoose';
+import mongoose, { Document, Model } from 'mongoose';
 import { PostType } from '../enums/PostType';
-interface PostAttributes {
+interface Post extends Document {
     userId: mongoose.Types.ObjectId;
-    profilePicUrl?: string;
     username: string;
+    profilePicUrl: string;
+    caption: string;
     likesNr?: number;
     commentsNr?: number;
     savesNr?: number;
     postType: PostType;
     reportsNr?: number;
     contentUrl: string;
-    caption?: string;
-}
-interface PostModel extends mongoose.Model<PostDocument> {
-    build(attrs: PostAttributes): PostDocument;
+    createdAt: Date;
 }
-interface PostDocument extends mongoose.Document {
-    userId: mongoose.Types.ObjectId;
-    profilePicUrl: string;
-    username: string;
-    likesNr: number;
-    commentsNr: number;
-    savesNr: number;
-    postType: PostType;
-    reportsNr: number;
-    contentUrl: string;
-    caption: string;
+interface PostModel extends Model<Post> {
+    build(attrs: Post): Post;
 }
 declare const Post: PostModel;
 export default Post;

package/build/models/Post.js

@@ -34,17 +34,22 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importStar(require("mongoose"));
-const postSchema = new mongoose_1.default.Schema({
-    userId: { type: mongoose_1.Schema.Types.ObjectId, required: true },
-    profilePicUrl: { type: String, required: false, default: '' },
+const postSchema = new mongoose_1.Schema({
+    userId: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true,
+        index: true,
+    },
     username: { type: String, required: true },
+    profilePicUrl: { type: String, default: '' },
+    caption: { type: String, default: '' },
     likesNr: { type: Number, required: false, default: 0 },
     commentsNr: { type: Number, required: false, default: 0 },
     savesNr: { type: Number, required: false, default: 0 },
     postType: { type: String, required: true },
     reportsNr: { type: Number, required: false, default: 0 },
     contentUrl: { type: String, required: true },
-    caption: { type: String, required: false, default: '' },
 }, {
     toJSON: {
         transform(doc, ret) {
@@ -58,5 +63,6 @@ const postSchema = new mongoose_1.default.Schema({
 postSchema.statics.build = (attrs) => {
     return new Post(attrs);
 };
+postSchema.index({ userId: 1 });
 const Post = mongoose_1.default.model('Post', postSchema);
 exports.default = Post;

package/build/models/Reply.d.ts

@@ -1,26 +1,17 @@
-import mongoose from 'mongoose';
-interface ReplyAttributes {
-    commentId: string;
-    userId: string;
+import mongoose, { Document } from 'mongoose';
+interface Reply extends Document {
+    commentId: mongoose.Types.ObjectId;
+    userId: mongoose.Types.ObjectId;
     username: string;
+    profilePicUrl: string;
+    text: string;
     likes?: number;
     upVotes?: number;
     downVotes?: number;
-    reportNr?: number;
-    text: string;
-}
-interface ReplyModel extends mongoose.Model<ReplyDocument> {
-    build(attrs: ReplyAttributes): ReplyDocument;
+    reportsNr?: number;
 }
-interface ReplyDocument extends mongoose.Document {
-    commentId: string;
-    userId: string;
-    username: string;
-    likes: number;
-    upVotes: number;
-    downVotes: number;
-    reportNr: number;
-    text: string;
+interface ReplyModel extends mongoose.Model<Reply> {
+    build(attrs: Reply): Reply;
 }
 declare const Reply: ReplyModel;
 export default Reply;

package/build/models/Reply.js

@@ -1,30 +1,67 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-const mongoose_1 = __importDefault(require("mongoose"));
+const mongoose_1 = __importStar(require("mongoose"));
 const replySchema = new mongoose_1.default.Schema({
-    commentId: { type: String, required: true },
-    userId: { type: String, required: true },
+    commentId: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: 'Comment',
+        index: true,
+        required: true,
+    },
+    userId: { type: mongoose_1.Schema.Types.ObjectId, ref: 'User', required: true },
     username: { type: String, required: true },
+    profilePicUrl: { type: String, default: '' },
+    text: { type: String, required: true },
     likes: { type: Number, required: false, default: 0 },
     upVotes: { type: Number, required: false, default: 0 },
     downVotes: { type: Number, required: false, default: 0 },
-    reportNr: { type: Number, required: false, default: 0 },
-    text: { type: String, required: true },
+    reportsNr: { type: Number, required: false, default: 0 },
 }, {
     toJSON: {
         transform(doc, ret) {
             ret.id = ret._id;
             delete ret.__v;
             delete ret._id;
-            delete ret.reportNr;
+            delete ret.reportsNr;
         },
     },
 });
 replySchema.statics.build = (attrs) => {
     return new Reply(attrs);
 };
+replySchema.index({ commentId: 1 });
 const Reply = mongoose_1.default.model('Reply', replySchema);
 exports.default = Reply;

package/build/models/User.d.ts

@@ -1,13 +1,13 @@
-import mongoose from 'mongoose';
+import { Document, Model } from 'mongoose';
 import { AccountType } from '../enums/AccountType';
 import { PaidPlan } from '../enums/PaidPlan';
-interface UserAttributes {
+interface User extends Document {
     email: string;
     username: string;
     password: string;
     name: string;
     surname: string;
-    profilePicUrl?: string;
+    profilePicUrl: string;
     accountType: AccountType;
     followers?: number;
     following?: number;
@@ -25,32 +25,8 @@ interface UserAttributes {
     grossIncome?: number;
     netIncome?: number;
 }
-interface UserModel extends mongoose.Model<UserDocument> {
-    build(attrs: UserAttributes): UserDocument;
-}
-interface UserDocument extends mongoose.Document {
-    email: string;
-    username: string;
-    password: string;
-    name: string;
-    surname: string;
-    profilePicUrl: string;
-    accountType: AccountType;
-    followers: number;
-    following: number;
-    postsNr: number;
-    phoneNumber: string;
-    verified: boolean;
-    paidPlan: PaidPlan;
-    totalLikes: number;
-    totalUpVotes: number;
-    totalDownVotes: number;
-    location: string;
-    height: number;
-    weight: number;
-    profession: string;
-    grossIncome: number;
-    netIncome: number;
+interface UserModel extends Model<User> {
+    build(attrs: User): User;
 }
 declare const User: UserModel;
 export default User;

package/build/models/User.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -12,16 +45,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const mongoose_1 = __importDefault(require("mongoose"));
+const mongoose_1 = __importStar(require("mongoose"));
 const PaidPlan_1 = require("../enums/PaidPlan");
 const password_1 = __importDefault(require("../utils/password"));
-const userSchema = new mongoose_1.default.Schema({
+const userSchema = new mongoose_1.Schema({
     email: { type: String, required: true, unique: true },
-    username: { type: String, required: true, unique: true },
+    username: { type: String, required: true, index: true, unique: true },
     password: { type: String, required: true },
     name: { type: String, required: true },
     surname: { type: String, required: true },
-    profilePicUrl: { type: String, required: false },
+    profilePicUrl: { type: String, default: '' },
     accountType: { type: String, required: true },
     followers: { type: Number, required: false, default: 0 },
     following: { type: Number, required: false, default: 0 },
@@ -68,6 +101,6 @@ userSchema.pre('save', function (done) {
 userSchema.statics.build = (attrs) => {
     return new User(attrs);
 };
-userSchema.index({ email: 1, username: 1 }, { unique: true });
+userSchema.index({ username: 1 }, { unique: true });
 const User = mongoose_1.default.model('User', userSchema);
 exports.default = User;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armi-wave/common",
-  "version": "1.23.11",
+  "version": "1.23.13",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",