@armi-wave/common 1.14.0 → 1.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,3 +1,4 @@
1
1
  export declare enum PaidPlan {
2
+ None = "none",
2
3
  Normal = "normal"
3
4
  }
@@ -3,5 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PaidPlan = void 0;
4
4
  var PaidPlan;
5
5
  (function (PaidPlan) {
6
+ PaidPlan["None"] = "none";
6
7
  PaidPlan["Normal"] = "normal";
7
8
  })(PaidPlan = exports.PaidPlan || (exports.PaidPlan = {}));
@@ -1,11 +1,13 @@
1
1
  import mongoose from 'mongoose';
2
2
  interface CommentAttributes {
3
- idPost: string;
3
+ postId: string;
4
+ userId: string;
4
5
  username: string;
5
- likes: number;
6
- upVotes: number;
7
- downVotes: number;
8
- reportNr: number;
6
+ likes?: number;
7
+ upVotes?: number;
8
+ downVotes?: number;
9
+ reportNr?: number;
10
+ replyNr?: number;
9
11
  contentUrl: string;
10
12
  text: string;
11
13
  }
@@ -13,12 +15,14 @@ interface CommentModel extends mongoose.Model<CommentDocument> {
13
15
  build(attrs: CommentAttributes): CommentDocument;
14
16
  }
15
17
  interface CommentDocument extends mongoose.Document {
16
- idPost: string;
18
+ postId: string;
19
+ userId: string;
17
20
  username: string;
18
21
  likes: number;
19
22
  upVotes: number;
20
23
  downVotes: number;
21
24
  reportNr: number;
25
+ replyNr: number;
22
26
  contentUrl: string;
23
27
  text: string;
24
28
  }
@@ -5,29 +5,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const mongoose_1 = __importDefault(require("mongoose"));
7
7
  const commentSchema = new mongoose_1.default.Schema({
8
- idPost: {
8
+ postId: {
9
9
  type: String,
10
10
  required: true,
11
11
  },
12
+ userId: { type: String, required: true },
12
13
  username: {
13
14
  type: String,
14
15
  required: true,
15
16
  },
16
17
  likes: {
17
18
  type: Number,
18
- required: true,
19
+ required: false,
20
+ default: 0,
19
21
  },
20
22
  upVotes: {
21
23
  type: Number,
22
- required: true,
24
+ required: false,
25
+ default: 0,
23
26
  },
24
27
  downVotes: {
25
28
  type: Number,
26
- required: true,
29
+ required: false,
30
+ default: 0,
27
31
  },
28
32
  reportNr: {
29
33
  type: Number,
30
- required: true,
34
+ required: false,
35
+ default: 0,
36
+ },
37
+ replyNr: {
38
+ type: Number,
39
+ required: false,
40
+ default: 0,
31
41
  },
32
42
  contentUrl: {
33
43
  type: String,
@@ -35,7 +45,8 @@ const commentSchema = new mongoose_1.default.Schema({
35
45
  },
36
46
  text: {
37
47
  type: String,
38
- required: true,
48
+ required: false,
49
+ default: '',
39
50
  },
40
51
  }, {
41
52
  toJSON: {
@@ -43,6 +54,7 @@ const commentSchema = new mongoose_1.default.Schema({
43
54
  ret.id = ret._id;
44
55
  delete ret.__v;
45
56
  delete ret._id;
57
+ delete ret.reportNr;
46
58
  },
47
59
  },
48
60
  });
@@ -3,14 +3,15 @@ import { PostType } from '../enums/PostType';
3
3
  interface PostAttributes {
4
4
  userId: string;
5
5
  username: string;
6
- likes: number;
7
- upVotes: number;
8
- downVotes: number;
9
- saved: number;
6
+ likes?: number;
7
+ upVotes?: number;
8
+ downVotes?: number;
9
+ commentsNr?: number;
10
+ saved?: number;
10
11
  postType: PostType;
11
- reportNr: number;
12
+ reportNr?: number;
12
13
  contentUrl: string;
13
- text: string;
14
+ text?: string;
14
15
  }
15
16
  interface PostModel extends mongoose.Model<PostDocument> {
16
17
  build(attrs: PostAttributes): PostDocument;
@@ -21,6 +22,7 @@ interface PostDocument extends mongoose.Document {
21
22
  likes: number;
22
23
  upVotes: number;
23
24
  downVotes: number;
25
+ commentsNr: number;
24
26
  saved: number;
25
27
  postType: PostType;
26
28
  reportNr: number;
@@ -15,19 +15,28 @@ const postSchema = new mongoose_1.default.Schema({
15
15
  },
16
16
  likes: {
17
17
  type: Number,
18
- required: true,
18
+ required: false,
19
+ default: 0,
19
20
  },
20
21
  upVotes: {
21
22
  type: Number,
22
- required: true,
23
+ required: false,
24
+ default: 0,
23
25
  },
24
26
  downVotes: {
25
27
  type: Number,
26
- required: true,
28
+ required: false,
29
+ default: 0,
30
+ },
31
+ commentsNr: {
32
+ type: Number,
33
+ required: false,
34
+ default: 0,
27
35
  },
28
36
  saved: {
29
37
  type: Number,
30
- required: true,
38
+ required: false,
39
+ default: 0,
31
40
  },
32
41
  postType: {
33
42
  type: String,
@@ -35,7 +44,8 @@ const postSchema = new mongoose_1.default.Schema({
35
44
  },
36
45
  reportNr: {
37
46
  type: Number,
38
- required: true,
47
+ required: false,
48
+ default: 0,
39
49
  },
40
50
  contentUrl: {
41
51
  type: String,
@@ -43,7 +53,8 @@ const postSchema = new mongoose_1.default.Schema({
43
53
  },
44
54
  text: {
45
55
  type: String,
46
- required: true,
56
+ required: false,
57
+ default: '',
47
58
  },
48
59
  }, {
49
60
  toJSON: {
@@ -51,6 +62,7 @@ const postSchema = new mongoose_1.default.Schema({
51
62
  ret.id = ret._id;
52
63
  delete ret.__v;
53
64
  delete ret._id;
65
+ delete ret.reportNr;
54
66
  },
55
67
  },
56
68
  });
@@ -8,27 +8,28 @@ interface UserAttributes {
8
8
  name: string;
9
9
  accountType: AccountType;
10
10
  surname: string;
11
- followers: number;
12
- following: number;
11
+ followers?: number;
12
+ following?: number;
13
+ postsNr?: number;
13
14
  phoneNumber: string;
14
- verified: boolean;
15
- paidPlan: PaidPlan;
16
- savedPosts: string[];
17
- likedPosts: string[];
18
- upVotedPosts: string[];
19
- likedComments: string[];
20
- bannedAccounts: string[];
21
- reportedPosts: string[];
22
- validReportedPosts: string[];
23
- totalLikes: number;
24
- totalUpVotes: number;
25
- totalDownVotes: number;
15
+ verified?: boolean;
16
+ paidPlan?: PaidPlan;
17
+ savedPosts?: string[];
18
+ likedPosts?: string[];
19
+ upVotedPosts?: string[];
20
+ likedComments?: string[];
21
+ bannedAccounts?: string[];
22
+ reportedPosts?: string[];
23
+ validReportedPosts?: string[];
24
+ totalLikes?: number;
25
+ totalUpVotes?: number;
26
+ totalDownVotes?: number;
26
27
  location: string;
27
- height: number;
28
- weight: number;
29
- profession: string;
30
- grossIncome: number;
31
- netIncome: number;
28
+ height?: number;
29
+ weight?: number;
30
+ profession?: string;
31
+ grossIncome?: number;
32
+ netIncome?: number;
32
33
  }
33
34
  interface UserModel extends mongoose.Model<UserDocument> {
34
35
  build(attrs: UserAttributes): UserDocument;
@@ -42,6 +43,7 @@ interface UserDocument extends mongoose.Document {
42
43
  surname: string;
43
44
  followers: number;
44
45
  following: number;
46
+ postsNr: number;
45
47
  phoneNumber: string;
46
48
  verified: boolean;
47
49
  paidPlan: PaidPlan;
@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const mongoose_1 = __importDefault(require("mongoose"));
16
+ const PaidPlan_1 = require("../enums/PaidPlan");
16
17
  const password_1 = __importDefault(require("../utils/password"));
17
18
  const userSchema = new mongoose_1.default.Schema({
18
19
  email: {
@@ -43,11 +44,18 @@ const userSchema = new mongoose_1.default.Schema({
43
44
  },
44
45
  followers: {
45
46
  type: Number,
46
- required: true,
47
+ required: false,
48
+ default: 0,
47
49
  },
48
50
  following: {
49
51
  type: Number,
50
- required: true,
52
+ required: false,
53
+ default: 0,
54
+ },
55
+ postsNr: {
56
+ type: Number,
57
+ required: false,
58
+ default: 0,
51
59
  },
52
60
  phoneNumber: {
53
61
  type: String,
@@ -55,51 +63,63 @@ const userSchema = new mongoose_1.default.Schema({
55
63
  },
56
64
  verified: {
57
65
  type: Boolean,
58
- required: true,
66
+ required: false,
67
+ default: false,
59
68
  },
60
69
  paidPlan: {
61
70
  type: String,
62
- required: true,
71
+ required: false,
72
+ default: PaidPlan_1.PaidPlan.None,
63
73
  },
64
74
  savedPosts: {
65
75
  type: Array,
66
- required: true,
76
+ required: false,
77
+ default: 0,
67
78
  },
68
79
  likedPosts: {
69
80
  type: Array,
70
- required: true,
81
+ required: false,
82
+ default: 0,
71
83
  },
72
84
  upVotedPosts: {
73
85
  type: Array,
74
- required: true,
86
+ required: false,
87
+ default: 0,
75
88
  },
76
89
  likedComments: {
77
90
  type: Array,
78
- required: true,
91
+ required: false,
92
+ default: [],
79
93
  },
80
94
  bannedAccounts: {
81
95
  type: Array,
82
- required: true,
96
+ required: false,
97
+ default: [],
83
98
  },
84
99
  reportedPosts: {
85
100
  type: Array,
86
- required: true,
101
+ required: false,
102
+ default: [],
87
103
  },
88
104
  validReportedPosts: {
89
105
  type: Array,
90
- required: true,
106
+ required: false,
107
+ default: [],
91
108
  },
92
109
  totalLikes: {
93
110
  type: Number,
94
- required: true,
111
+ required: false,
112
+ default: 0,
95
113
  },
96
114
  totalUpVotes: {
97
115
  type: Number,
98
- required: true,
116
+ required: false,
117
+ default: 0,
99
118
  },
100
119
  totalDownVotes: {
101
120
  type: Number,
102
- required: true,
121
+ required: false,
122
+ default: 0,
103
123
  },
104
124
  location: {
105
125
  type: String,
@@ -107,23 +127,28 @@ const userSchema = new mongoose_1.default.Schema({
107
127
  },
108
128
  height: {
109
129
  type: Number,
110
- required: true,
130
+ required: false,
131
+ default: 0,
111
132
  },
112
133
  weight: {
113
134
  type: Number,
114
- required: true,
135
+ required: false,
136
+ default: 0,
115
137
  },
116
138
  profession: {
117
139
  type: String,
118
- required: true,
140
+ required: false,
141
+ default: '',
119
142
  },
120
143
  grossIncome: {
121
144
  type: Number,
122
- required: true,
145
+ required: false,
146
+ default: 0,
123
147
  },
124
148
  netIncome: {
125
149
  type: Number,
126
- required: true,
150
+ required: false,
151
+ default: 0,
127
152
  },
128
153
  }, {
129
154
  toJSON: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@armi-wave/common",
3
- "version": "1.14.0",
3
+ "version": "1.17.0",
4
4
  "description": "",
5
5
  "main": "./build/index.js",
6
6
  "types": "./build/index.d.ts",