@armi-wave/common 1.23.0 → 1.23.2

package/build/index.d.ts

@@ -2,13 +2,14 @@ import User from './models/User';
 import Post from './models/Post';
 import Comment from './models/Comment';
 import Reply from './models/Reply';
+import Follow from './models/Follow';
 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 };
+export { User, Post, Comment, Reply, Follow };
 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.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.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"));
@@ -26,6 +26,8 @@ const Comment_1 = __importDefault(require("./models/Comment"));
 exports.Comment = Comment_1.default;
 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 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/Follow.d.ts

@@ -1,24 +1,10 @@
-import mongoose from 'mongoose';
-interface FollowAttributes {
-    userId: string;
-    followers: Record<string, {
-        followedAt: Date;
-    }>;
-    following: Record<string, {
-        followedAt: Date;
-    }>;
+import mongoose, { Document, Model } from 'mongoose';
+interface Follow extends Document {
+    follower: mongoose.Types.ObjectId;
+    following: mongoose.Types.ObjectId;
+    createdAt: Date;
 }
-interface FollowModel extends mongoose.Model<FollowDocument> {
-    build(attrs: FollowAttributes): FollowDocument;
-}
-interface FollowDocument extends mongoose.Document {
-    userId: string;
-    followers: Record<string, {
-        followedAt: Date;
-    }>;
-    following: Record<string, {
-        followedAt: Date;
-    }>;
+interface FollowModel extends Model<Follow> {
 }
 declare const Follow: FollowModel;
 export default Follow;

package/build/models/Follow.js

@@ -1,25 +1,54 @@
 "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 followSchema = new mongoose_1.default.Schema({
-    userId: { type: String, required: true },
-    followers: {
-        type: Map,
-        of: {
-            followedAt: { type: Date, required: true },
-        },
-        default: {},
+const mongoose_1 = __importStar(require("mongoose"));
+// Define the schema
+const followSchema = new mongoose_1.Schema({
+    follower: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true,
+        index: true,
     },
     following: {
-        type: Map,
-        of: {
-            followedAt: { type: Date, required: true },
-        },
-        default: {},
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true,
+        index: true,
     },
+    createdAt: { type: Date, default: Date.now },
 }, {
     toJSON: {
         transform(doc, ret) {
@@ -29,8 +58,8 @@ const followSchema = new mongoose_1.default.Schema({
         },
     },
 });
-followSchema.statics.build = (attrs) => {
-    return new Follow(attrs);
-};
+// Ensure a user cannot follow the same person multiple times
+followSchema.index({ follower: 1, following: 1 }, { unique: true });
+// Create and export the model
 const Follow = mongoose_1.default.model('Follow', followSchema);
 exports.default = Follow;

package/package.json

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