5 files changed, 62 insertions, 24 deletions

diff --git a/models/polls/poll.model.ts b/models/polls/poll.model.ts
index 7f6be9a..6749e5c 100644
--- a/models/polls/poll.model.ts
+++ b/models/polls/poll.model.ts
@@ -1,5 +1,20 @@
 import { Model, model } from 'mongoose';
 import { PollSchema, pollSchema } from './poll.schema';
+import { Types } from 'mongoose';
+import { Which } from 'which-types';
+
+pollSchema.methods.vote = function(userId: string, which: Which): PollSchema {
+  const participants: Types.ObjectId[] = ['left', 'right'].reduce((acc, option) => {
+    const { votes } = this.contents[option];
+    return acc.concat(votes);
+  }, []);
+
+  if (!participants.some(user => user.equals(userId))) {
+    this.contents[which].votes.push(userId);
+  }
+
+  return this.save();
+}
 
 export default model<PollSchema, Model<PollSchema>>('Poll', pollSchema);
 
diff --git a/models/polls/poll.schema.ts b/models/polls/poll.schema.ts
index bc6d497..4d1d762 100644
--- a/models/polls/poll.schema.ts
+++ b/models/polls/poll.schema.ts
@@ -1,27 +1,21 @@
 import { Document, Schema, Types } from 'mongoose';
-import { User } from '../users/user.schema';
 
-export interface ImageData {
+export interface ImageDataSchema {
   url: string;
-  votes: number;
 }
 
-export interface Poll {
-  author: User;
+export interface PollSchema extends Document {
   contents: {
-    left: ImageData;
-    right: ImageData;
+    left: ImageDataSchema;
+    right: ImageDataSchema;
   };
-}
-
-export interface PollSchema extends Document, Omit<Poll, 'author'> {
+  createdAt: Date;
   authorId: string;
+  vote: (userId: string, which: 'left' | 'right') => PollSchema;
 }
 
-
-const imageDataSchema = {
+export const imageDataSchema = {
   url: String,
-  votes: Number
 };
 
 export const pollSchema = new Schema({
@@ -33,5 +27,5 @@ export const pollSchema = new Schema({
     type: Types.ObjectId,
     ref: 'User'
   }
-});
+}, { timestamps: true });
 
diff --git a/models/users/user.schema.ts b/models/users/user.schema.ts
index fd7d1e1..ff6cbe9 100644
--- a/models/users/user.schema.ts
+++ b/models/users/user.schema.ts
@@ -1,24 +1,21 @@
 import { Document, Schema } from 'mongoose';
+import { User } from 'which-types';
 
-export interface User {
-  name: string;
-  avatarUrl?: string;
-  age?: number;
-}
-
-export interface UserSchema extends Document, User {
+export interface UserSchema extends Document, Omit<User, '_id'> {
   password: string;
 }
 
 export const userSchema = new Schema({
-  name: String,
+  username: String,
   password: String,
+  email: String,
   avatarUrl: {
     type: String,
     required: false
   },
   age: {
-    type: Number
+    type: Number,
+    required: false
   }
-});
+}, { timestamps: true });
 
diff --git a/models/votes/vote.model.ts b/models/votes/vote.model.ts
new file mode 100644
index 0000000..df2307e
--- /dev/null
+++ b/models/votes/vote.model.ts
@@ -0,0 +1,7 @@
+import { Model, model } from 'mongoose';
+import { VoteSchema, voteSchema } from './vote.schema';
+
+voteSchema.index({ pollId: 1, userId: 1 }, { unique: true }); // Unique together
+
+export default model<VoteSchema, Model<VoteSchema>>('Vote', voteSchema);
+
diff --git a/models/votes/vote.schema.ts b/models/votes/vote.schema.ts
new file mode 100644
index 0000000..63ba212
--- /dev/null
+++ b/models/votes/vote.schema.ts
@@ -0,0 +1,25 @@
+import { Document, Schema, Types } from 'mongoose';
+import { Vote } from 'which-types';
+
+export interface VoteSchema extends Document, Omit<Vote, '_id'> {
+  password: string;
+}
+
+export const voteSchema = new Schema({
+  userId: {
+    type: Types.ObjectId,
+    ref: 'user',
+    required: true
+  },
+  pollId: {
+    type: Types.ObjectId,
+    ref: 'poll',
+    required: true
+  },
+  which: {
+    type: String,
+    enum: ['left', 'right'],
+    required: true
+  }
+}, { timestamps: true });
+