Browse Source

counter: exports moduleName

MaiXinRong 8 years ago
parent
commit
b1a0b0e150
2 changed files with 24 additions and 6 deletions
  1. 21 3
      public/counter/counter.js
  2. 3 3
      test/unit/counter/testCounter.js

+ 21 - 3
public/counter/counter.js

@@ -15,11 +15,26 @@ counterSchema.statics.findAndModify = function (query, sort, doc, options, callb
 };
 var counterModel = projectdb.model("counters", counterSchema);
 
-const PROJECT_COUNTER = 'projects', USER_COUNTER = 'users', BILL_COUNTER = 'bills', RATION_COUNTER = 'rations',
-    REPORT_COUNTER = 'rptTemplates', FEE_COUNTER = 'fees'
+// All counter Must predefine in DB
+const COUNTER_MODULE_NAME = {
+    project: 'projects',
+    user: 'users',
+    bills: 'bills',
+    ration: 'rations',
+    report: 'rptTemplates',
+    fee: 'fees',
+    template_bills: 'temp_bills'
+}
+/*const PROJECT_COUNTER = 'projects', USER_COUNTER = 'users', BILL_COUNTER = 'bills', RATION_COUNTER = 'rations',
+    REPORT_COUNTER = 'rptTemplates', FEE_COUNTER = 'fees'*/
 
 var counterDAO = function(){};
 
+/*
+ * callback = function (err, result) {
+ *     result.value.sequence_value ΪÐ޸ĺóµÄid
+ * }
+ */
 counterDAO.prototype.getIDAfterCount = function(moduleName, stepCount, callback) {
     var sc = stepCount;
     if (isNaN(stepCount) || (stepCount < 0)) {
@@ -46,4 +61,7 @@ counterDAO.prototype.getCurrentID = function(moduleName, callback) {
     }
 }
 
-module.exports = new counterDAO();
+module.exports = {
+    counterDAO: new counterDAO(),
+    moduleName: COUNTER_MODULE_NAME
+};

+ 3 - 3
test/unit/counter/testCounter.js

@@ -6,7 +6,7 @@ var counter = require('../../../public/counter/counter');
 var mongoose = require('mongoose');
 
 test('test counter\'s usage 0:', function(t) {
-    var promise = counter.getCurrentID("rptTemplates",function(result, err) {
+    var promise = counter.counterDAO.getCurrentID(counter.moduleName.report,function(result, err) {
         console.log('callback result 0: ' + result.sequence_value);
     });
     if (promise) {
@@ -19,7 +19,7 @@ test('test counter\'s usage 0:', function(t) {
 })
 
 test('test counter\'s usage 1:', function(t) {
-    var promise = counter.getCurrentID("rptTemplates", null);
+    var promise = counter.counterDAO.getCurrentID(counter.moduleName.report, null);
     if (promise) {
         promise.then(function(rst){
             console.log('promise result 1: ' + rst.sequence_value);
@@ -30,7 +30,7 @@ test('test counter\'s usage 1:', function(t) {
 })
 
 test('test counter\'s usage 2:', function(t) {
-    counter.getIDAfterCount("rptTemplates",1, function(err, result){
+    counter.counterDAO.getIDAfterCount(counter.moduleName.report, 1, function(err, result){
         console.log('result 2: ' + result.value.sequence_value);
         t.equal(result.value.sequence_value, 1);
         t.end();