@armi-wave/common 1.23.2 → 1.23.4

package/build/index.d.ts

@@ -3,13 +3,14 @@ import Post from './models/Post';
 import Comment from './models/Comment';
 import Reply from './models/Reply';
 import Follow from './models/Follow';
+import Like from './models/Like';
 import BadRequestError from './errors/bad-request-error';
 import DatabaseConnectionError from './errors/database-connection-error';
 import CustomError from './errors/custom-error';
 import NotAuthorizedError from './errors/not-authorized-error';
 import NotFoundError from './errors/not-found-error';
 import RequestValidationError from './errors/request-validation-error';
-export { User, Post, Comment, Reply, Follow };
+export { User, Post, Comment, Reply, Follow, Like };
 export { BadRequestError, DatabaseConnectionError, CustomError, NotAuthorizedError, NotFoundError, RequestValidationError, };
 export * from './middlewares/current-user';
 export * from './middlewares/error-handler';

package/build/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upload = exports.ensureBucketExists = exports.minioClient = exports.RequestValidationError = exports.NotFoundError = exports.NotAuthorizedError = exports.CustomError = exports.DatabaseConnectionError = exports.BadRequestError = exports.Follow = exports.Reply = exports.Comment = exports.Post = exports.User = void 0;
+exports.upload = exports.ensureBucketExists = exports.minioClient = exports.RequestValidationError = exports.NotFoundError = exports.NotAuthorizedError = exports.CustomError = exports.DatabaseConnectionError = exports.BadRequestError = exports.Like = exports.Follow = exports.Reply = exports.Comment = exports.Post = exports.User = void 0;
 const User_1 = __importDefault(require("./models/User"));
 exports.User = User_1.default;
 const Post_1 = __importDefault(require("./models/Post"));
@@ -28,6 +28,8 @@ const Reply_1 = __importDefault(require("./models/Reply"));
 exports.Reply = Reply_1.default;
 const Follow_1 = __importDefault(require("./models/Follow"));
 exports.Follow = Follow_1.default;
+const Like_1 = __importDefault(require("./models/Like"));
+exports.Like = Like_1.default;
 const bad_request_error_1 = __importDefault(require("./errors/bad-request-error"));
 exports.BadRequestError = bad_request_error_1.default;
 const database_connection_error_1 = __importDefault(require("./errors/database-connection-error"));

package/build/models/Like.d.ts

@@ -0,0 +1,10 @@
+import mongoose, { Document, Model } from 'mongoose';
+interface Like extends Document {
+    userId: mongoose.Types.ObjectId;
+    postId: mongoose.Types.ObjectId;
+    createdAt: Date;
+}
+interface LikeModel extends Model<Like> {
+}
+declare const Like: LikeModel;
+export default Like;

package/build/models/Like.js

@@ -0,0 +1,65 @@
+"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;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const mongoose_1 = __importStar(require("mongoose"));
+// Define the schema
+const likeSchema = new mongoose_1.Schema({
+    userId: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true,
+        index: true,
+    },
+    postId: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: 'Post',
+        required: true,
+        index: true,
+    },
+    createdAt: { type: Date, default: Date.now },
+}, {
+    toJSON: {
+        transform(doc, ret) {
+            ret.id = ret._id;
+            delete ret.__v;
+            delete ret._id;
+        },
+    },
+});
+// Ensure a user cannot like the same person multiple times
+likeSchema.index({ userId: 1, postId: 1 }, { unique: true });
+// Create and export the model
+const Like = mongoose_1.default.model('Like', likeSchema);
+exports.default = Like;

package/build/models/Post.d.ts

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

package/build/models/Post.js

@@ -1,21 +1,50 @@
 "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 postSchema = new mongoose_1.default.Schema({
-    userId: { type: String, required: true },
+    userId: { type: mongoose_1.Schema.Types.ObjectId, required: true },
+    profilePicUrl: { type: String, required: false, default: '' },
     username: { 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 },
+    likesNr: { type: Number, required: false, default: 0 },
     commentsNr: { type: Number, required: false, default: 0 },
-    saved: { type: Number, required: false, default: 0 },
+    savesNr: { type: Number, required: false, default: 0 },
     postType: { type: String, required: true },
-    reportNr: { type: Number, required: false, default: 0 },
+    reportsNr: { type: Number, required: false, default: 0 },
     contentUrl: { type: String, required: true },
-    text: { type: String, required: false, default: '' },
+    caption: { type: String, required: false, default: '' },
 }, {
     toJSON: {
         transform(doc, ret) {

package/build/models/User.d.ts

@@ -7,7 +7,7 @@ interface UserAttributes {
     password: string;
     name: string;
     surname: string;
-    profilePicUr?: string;
+    profilePicUrl?: string;
     accountType: AccountType;
     followers?: number;
     following?: number;
@@ -15,13 +15,6 @@ interface UserAttributes {
     phoneNumber: string;
     verified?: boolean;
     paidPlan?: PaidPlan;
-    savedPosts?: string[];
-    likedPosts?: string[];
-    upVotedPosts?: string[];
-    likedComments?: string[];
-    bannedAccounts?: string[];
-    reportedPosts?: string[];
-    validReportedPosts?: string[];
     totalLikes?: number;
     totalUpVotes?: number;
     totalDownVotes?: number;
@@ -49,13 +42,6 @@ interface UserDocument extends mongoose.Document {
     phoneNumber: string;
     verified: boolean;
     paidPlan: PaidPlan;
-    savedPosts: string[];
-    likedPosts: string[];
-    upVotedPosts: string[];
-    likedComments: string[];
-    bannedAccounts: string[];
-    reportedPosts: string[];
-    validReportedPosts: string[];
     totalLikes: number;
     totalUpVotes: number;
     totalDownVotes: number;

package/build/models/User.js

@@ -29,13 +29,6 @@ const userSchema = new mongoose_1.default.Schema({
     phoneNumber: { type: String, required: true },
     verified: { type: Boolean, required: false, default: false },
     paidPlan: { type: String, required: false, default: PaidPlan_1.PaidPlan.None },
-    savedPosts: { type: Array, required: false, default: 0 },
-    likedPosts: { type: Array, required: false, default: 0 },
-    upVotedPosts: { type: Array, required: false, default: 0 },
-    likedComments: { type: Array, required: false, default: [] },
-    bannedAccounts: { type: Array, required: false, default: [] },
-    reportedPosts: { type: Array, required: false, default: [] },
-    validReportedPosts: { type: Array, required: false, default: [] },
     totalLikes: { type: Number, required: false, default: 0 },
     totalUpVotes: { type: Number, required: false, default: 0 },
     totalDownVotes: { type: Number, required: false, default: 0 },
@@ -54,12 +47,6 @@ const userSchema = new mongoose_1.default.Schema({
             delete ret._id;
             delete ret.phoneNumber;
             delete ret.paidPlan;
-            delete ret.savedPosts;
-            delete ret.likedPosts;
-            delete ret.upVotedPosts;
-            delete ret.likedComments;
-            delete ret.reportedPosts;
-            delete ret.validReportedPosts;
             delete ret.location;
             delete ret.height;
             delete ret.weight;
@@ -81,5 +68,6 @@ userSchema.pre('save', function (done) {
 userSchema.statics.build = (attrs) => {
     return new User(attrs);
 };
+userSchema.index({ email: 1, 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.2",
+  "version": "1.23.4",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",