Fix encodage

betagouv · Aug 18, 2015 · 69f035a · 69f035a
1 parent 5a76d8c
commit 69f035a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/server/api/demande/demande.model.js b/server/api/demande/demande.model.js
@@ -7,7 +7,7 @@ var crypto = require('crypto');
 var DemandeSchema = new Schema({
   createdAt:      { type: Date, default: Date.now },
   observations:   { type: String },
-  data:           { type: String },
+  data:           { type: Schema.Types.Mixed },
   etablissement:  { type: Schema.Types.ObjectId, ref: 'Etablissement' },
   status:         { type: String, enum: ['new', 'pending', 'done'], default: 'new' },
   notification:   {

diff --git a/server/components/crypto/crypto.js b/server/components/crypto/crypto.js
@@ -3,19 +3,19 @@
 var _ = require('lodash');
 
 exports.decode = function(demande) {
-  return demande;
-
   // var decoded = new Buffer(demande.data, 'base64').toString();
   // var demandeObj = JSON.parse(decoded);
 
-  // demandeObj._id = demande._id;
-  // demandeObj.createdAt = demande.createdAt;
-  // demandeObj.etablissement = demande.etablissement;
-  // demandeObj.status = demande.status;
-  // demandeObj.notification = demande.notification;
-  // demandeObj.observations = demande.observations;
+  var demandeObj =  _.assign({}, demande.data);
+
+  demandeObj._id = demande._id;
+  demandeObj.createdAt = demande.createdAt;
+  demandeObj.etablissement = demande.etablissement;
+  demandeObj.status = demande.status;
+  demandeObj.notification = demande.notification;
+  demandeObj.observations = demande.observations;
 
-  // return demandeObj;
+  return demandeObj;
 };
 
 exports.encode = function(body) {