Change all the get_draft.json endpoints to be like sign_up one (simpler because the...

diff --git a/api/account/change_details/get_draft.json.jst b/api/account/change_details/get_draft.json.jst
index a168014..2f25eb2 100644 (file)
--- a/api/account/change_details/get_draft.json.jst
+++ b/api/account/change_details/get_draft.json.jst
@@ -1,6 +1,3 @@
-let jst_server = (await import('@ndcode/jst_server')).default
-let XDate = require('xdate')
-
 return async env => {
   let post_request = await _require('/_lib/post_request.jst')
   let get_session = await _require('/_lib/get_session.jst')
@@ -15,17 +12,10 @@ return async env => {
         let root = await transaction.get({})
         let session = await get_session(env, root)
 
-        let change_details_draft = await session.get('change_details_draft')
-        return (
-          change_details_draft !== undefined &&
-            XDate.now() < await change_details_draft.get_json('expires') ?
-            {
-              given_names: await change_details_draft.get_json('given_names'),
-              family_name: await change_details_draft.get_json('family_name'),
-              contact_me: await change_details_draft.get_json('contact_me')
-            } :
-            null
-        )
+        let change_details_draft = await session.get_json('change_details_draft')
+        if (change_details_draft === undefined || env.now >= change_details_draft.expires)
+          change_details_draft = null
+        return change_details_draft
       }
       finally {
         transaction.rollback()

diff --git a/api/account/sign_up/get_draft.json.jst b/api/account/sign_up/get_draft.json.jst
index 9649f6c..d648a6a 100644 (file)
--- a/api/account/sign_up/get_draft.json.jst
+++ b/api/account/sign_up/get_draft.json.jst
@@ -1,6 +1,3 @@
-let jst_server = (await import('@ndcode/jst_server')).default
-let XDate = require('xdate')
-
 return async env => {
   let post_request = await _require('/_lib/post_request.jst')
   let get_session = await _require('/_lib/get_session.jst')

diff --git a/api/contact/get_draft.json.jst b/api/contact/get_draft.json.jst
index da507fa..05ab1f1 100644 (file)
--- a/api/contact/get_draft.json.jst
+++ b/api/contact/get_draft.json.jst
@@ -1,6 +1,3 @@
-let jst_server = (await import('@ndcode/jst_server')).default
-let XDate = require('xdate')
-
 return async env => {
   let post_request = await _require('/_lib/post_request.jst')
   let get_session = await _require('/_lib/get_session.jst')
@@ -15,19 +12,10 @@ return async env => {
         let root = await transaction.get({})
         let session = await get_session(env, root)
 
-        let contact_draft = await session.get('contact_draft')
-        return (
-          contact_draft !== undefined &&
-            XDate.now() < await contact_draft.get_json('expires') ?
-            {
-              given_names: await contact_draft.get_json('given_names'),
-              family_name: await contact_draft.get_json('family_name'),
-              company: await contact_draft.get_json('company'),
-              email: await contact_draft.get_json('email'),
-              message: await contact_draft.get_json('message')
-            } :
-            null
-        )
+        let contact_draft = await session.get_json('contact_draft')
+        if (contact_draft === undefined || env.now >= contact_draft.expires)
+          contact_draft = null
+        return contact_draft
       }
       finally {
         transaction.rollback()