From 5efb0ed941ed80136e63014c4f615574b2b613d7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 23 Jan 2015 17:58:41 -0500
Subject: edit subscription partial stub

---
 server/lib/api/index.js              |  1 +
 server/lib/api/subscription.js       | 22 ++++++++++++++++++++++
 server/lib/schemas/Subscription.js   |  3 +--
 server/lib/webhook/config.js         |  6 ------
 server/lib/webhook/recurly-config.js |  6 ++++++
 server/lib/webhook/webhook.js        |  8 +++++---
 6 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 server/lib/api/subscription.js
 delete mode 100644 server/lib/webhook/config.js
 create mode 100644 server/lib/webhook/recurly-config.js

(limited to 'server/lib')

diff --git a/server/lib/api/index.js b/server/lib/api/index.js
index 11e13fc..9478d9b 100644
--- a/server/lib/api/index.js
+++ b/server/lib/api/index.js
@@ -8,6 +8,7 @@ var api = {
 	projects: require('./projects'),
 	rooms: require('./rooms'),
 	collaborator: require('./collaborator'),
+	subscription: require('./subscription'),
 }
 
 module.exports = api
diff --git a/server/lib/api/subscription.js b/server/lib/api/subscription.js
new file mode 100644
index 0000000..6fe8c61
--- /dev/null
+++ b/server/lib/api/subscription.js
@@ -0,0 +1,22 @@
+/* jshint node: true */
+
+var _ = require('lodash'),
+	util = require('../util'),
+	upload = require('../upload'),
+	config = require('../../../config.json'),
+	User = require('../schemas/User'),
+	Project = require('../schemas/Project'),
+	Layout = require('../schemas/Layout'),
+	Subscription = require('../schemas/Subscription');
+
+var subscription = module.exports = {
+
+/*
+	index: function(req, res){
+		Project.find({ user_id: req.user._id }, function(err, docs){
+			res.json(docs)
+		})
+	},
+*/
+
+};
\ No newline at end of file
diff --git a/server/lib/schemas/Subscription.js b/server/lib/schemas/Subscription.js
index 99e4ebf..2f49ea1 100644
--- a/server/lib/schemas/Subscription.js
+++ b/server/lib/schemas/Subscription.js
@@ -9,9 +9,8 @@ var mongoose = require('mongoose'),
 var SubscriptionSchema = new mongoose.Schema({
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 
-	plan_level: { type: Number, default: 0 },
 	plan_type: { type: String, default: "free" },
-	last_charged: { type: Date, default: null },
+	plan_period: { type: String, default: "monthly" },
 
 	subscription_uuid: { type: String },
 	subscription_add_ons: [{
diff --git a/server/lib/webhook/config.js b/server/lib/webhook/config.js
deleted file mode 100644
index 3d7e1c5..0000000
--- a/server/lib/webhook/config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-	API_KEY: process.env['VVALLS_RECURLY_SECRET'],
-	SUBDOMAIN: 'vvalls',
-	ENVIRONMENT: 'sandbox',
-	DEBUG: true,
-};
diff --git a/server/lib/webhook/recurly-config.js b/server/lib/webhook/recurly-config.js
new file mode 100644
index 0000000..3d7e1c5
--- /dev/null
+++ b/server/lib/webhook/recurly-config.js
@@ -0,0 +1,6 @@
+module.exports = {
+	API_KEY: process.env['VVALLS_RECURLY_SECRET'],
+	SUBDOMAIN: 'vvalls',
+	ENVIRONMENT: 'sandbox',
+	DEBUG: true,
+};
diff --git a/server/lib/webhook/webhook.js b/server/lib/webhook/webhook.js
index 2e5e627..e9a7925 100644
--- a/server/lib/webhook/webhook.js
+++ b/server/lib/webhook/webhook.js
@@ -20,7 +20,7 @@ var User = require('../schemas/User'),
 	moment = require('moment'),
 	xml2js = require('xml2js'),
 	Recurly = require('node-recurly'),
-	recurly = new Recurly(require('./config'));
+	recurly = new Recurly(require('./recurly-config'));
 
 var parser = new xml2js.Parser();
 
@@ -64,12 +64,14 @@ var subscribe = module.exports = {
         var plan_period = plan[1]
         
         user.plan_type = plan_type
-        user.plan_period = plan_period
         user.plan_level = subscribe.plan_level[plan_type]
 
 				var subscriber = new Subscription ()
-				subscriber.user_id = user._id
         subscriber.uuid = data.subscription.uuid
+				subscriber.user_id = user._id
+        subscriber.plan_type = plan_type
+        subscriber.plan_period = plan_period
+        subscriber.plan_level = subscribe.plan_level[plan_type]
         subscriber.add_ons = subscription.add_ons.map(function(add_on){
         	return {
         		name: add_on.plan,
-- 
cgit v1.2.3-70-g09d2