From 334cdccec27afcb1a353df49f7edb77181048843 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Tue, 30 Apr 2013 12:25:44 +0200
Subject: made a function for returning project by ID

---
 models/project.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'models/project.js')

diff --git a/models/project.js b/models/project.js
index 2424694..2641fe5 100644
--- a/models/project.js
+++ b/models/project.js
@@ -6,12 +6,8 @@
 var mongoose = require('mongoose')
   , Schema = mongoose.Schema;
 
-
-
-
-
 var ProjectSchema = new Schema({
-    user: { type: String, ref: 'User' },
+    user: { type: Schema.ObjectId, ref: 'User' },
     name: { type: String, default: '', trim: true },
     description: {type: String, default: '', trim: true },
     currency: { type: String, default: 'kr', trim: true },
@@ -20,7 +16,6 @@ var ProjectSchema = new Schema({
     updated: { type: Date, default: Date.now }
 });
 
-
 // the four validations below only apply if you are signing up traditionally
 
 ProjectSchema.path('name').validate(function(name) {
@@ -28,12 +23,29 @@ ProjectSchema.path('name').validate(function(name) {
     return name.length;
 }, 'Project name cannot be blank');
 
-ProjectSchema.methods = {
+ProjectSchema.statics = {
 
     log: function() {
         console.log('wat. wat logged this');
+    },
+
+
+
+   /**
+    * Find project by id
+    *
+    * @param {ObjectId} id
+    * @param {Function} callback
+    * @api private
+    */
+
+    load: function(id, callback) {
+        this.findOne({ _id: id })
+          .populate('user')
+          .exec(callback);
     }
 
+
 }
 
 mongoose.model('Project', ProjectSchema);
-- 
cgit v1.2.3


From c0630c6db730ba50ab247435bff14a36a4303e93 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Tue, 30 Apr 2013 13:28:45 +0200
Subject: added shorturl for projects

---
 models/project.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'models/project.js')

diff --git a/models/project.js b/models/project.js
index 2641fe5..f29c7f8 100644
--- a/models/project.js
+++ b/models/project.js
@@ -13,7 +13,8 @@ var ProjectSchema = new Schema({
     currency: { type: String, default: 'kr', trim: true },
     public: { type: String, default: 'invite-only' },
     created: { type: Date, default: Date.now },
-    updated: { type: Date, default: Date.now }
+    updated: { type: Date, default: Date.now },
+    shortURL: { type: String, unique: true }
 });
 
 // the four validations below only apply if you are signing up traditionally
@@ -23,6 +24,21 @@ ProjectSchema.path('name').validate(function(name) {
     return name.length;
 }, 'Project name cannot be blank');
 
+
+ProjectSchema.pre('save', function(next) {
+    if (this.shortURL !== undefined) return next();
+    var chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+    this.shortURL = '';
+    for (var i = 0; i < 6; i++) {
+        var x = Math.floor(Math.random() * chars.length);
+        this.shortURL += chars.charAt(x);
+    }
+    console.log('SHORT: ' + this.shortURL);
+    next();
+});
+
+
+
 ProjectSchema.statics = {
 
     log: function() {
-- 
cgit v1.2.3


From d556ef525f593ccb8c688e340f70659849ac74a3 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Tue, 30 Apr 2013 14:41:30 +0200
Subject: renamed files to match model names

---
 models/project.js | 67 -------------------------------------------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 models/project.js

(limited to 'models/project.js')

diff --git a/models/project.js b/models/project.js
deleted file mode 100644
index f29c7f8..0000000
--- a/models/project.js
+++ /dev/null
@@ -1,67 +0,0 @@
-
-/**
- * Module dependencies
- */
-
-var mongoose = require('mongoose')
-  , Schema = mongoose.Schema;
-
-var ProjectSchema = new Schema({
-    user: { type: Schema.ObjectId, ref: 'User' },
-    name: { type: String, default: '', trim: true },
-    description: {type: String, default: '', trim: true },
-    currency: { type: String, default: 'kr', trim: true },
-    public: { type: String, default: 'invite-only' },
-    created: { type: Date, default: Date.now },
-    updated: { type: Date, default: Date.now },
-    shortURL: { type: String, unique: true }
-});
-
-// the four validations below only apply if you are signing up traditionally
-
-ProjectSchema.path('name').validate(function(name) {
-    // if you're authenticated by any of the oauth strategies (facebook, twitter), don't validate
-    return name.length;
-}, 'Project name cannot be blank');
-
-
-ProjectSchema.pre('save', function(next) {
-    if (this.shortURL !== undefined) return next();
-    var chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
-    this.shortURL = '';
-    for (var i = 0; i < 6; i++) {
-        var x = Math.floor(Math.random() * chars.length);
-        this.shortURL += chars.charAt(x);
-    }
-    console.log('SHORT: ' + this.shortURL);
-    next();
-});
-
-
-
-ProjectSchema.statics = {
-
-    log: function() {
-        console.log('wat. wat logged this');
-    },
-
-
-
-   /**
-    * Find project by id
-    *
-    * @param {ObjectId} id
-    * @param {Function} callback
-    * @api private
-    */
-
-    load: function(id, callback) {
-        this.findOne({ _id: id })
-          .populate('user')
-          .exec(callback);
-    }
-
-
-}
-
-mongoose.model('Project', ProjectSchema);
-- 
cgit v1.2.3