fix(infra.py): fix to used datestore. ref #402 @0.5h

infra.py

@@ -18,33 +18,30 @@
 from __future__ import division
 from __future__ import print_function
 
-from google.appengine.ext import ndb
+from google.cloud import datastore
 
 import json
 
 with open('data/dict.json') as json_file:
     json_dic = json.load(json_file)
 
 
-class User(ndb.Model):
-    words = ndb.TextProperty()
-    last_word = ndb.TextProperty()
-    count = ndb.IntegerProperty()
-    date = ndb.DateTimeProperty(auto_now_add=True)
+CLIENT = datastore.Client()
+CLIENT_KEY = 'User'
 
 
 def reset_datastore(user_id):
     try:
-        user = User.get_by_id(user_id)
-        user.key.delete()
+        key = CLIENT.key(CLIENT_KEY, user_id)
+        CLIENT.delete(key)
     except Exception:
         pass
 
 
 def check_word_datastore(user_id, check_word):
     try:
-        user = User.get_by_id(user_id)
-        words = user.words.split(u',')
+        key = CLIENT.key(CLIENT_KEY, user_id)
+        words = CLIENT.get(key)['words'].split(u',')
         if check_word in words:
             return False
         return True
@@ -54,15 +51,19 @@ def check_word_datastore(user_id, check_word):
 
 def save_word_datastore(user_id, save_word):
     try:
-        user = User.get_by_id(user_id)
-        user.words += u',' + save_word
-        user.count += 1
+        key = CLIENT.key(CLIENT_KEY, user_id)
+        user = CLIENT.get(key)
+        user['words'] += u',' + save_word
+        user['count'] += 1
     except Exception:
-        user = User(id=user_id)
-        user.words = save_word
-        user.count = 1
-    user.last_word = save_word
-    user.put()
+        key = CLIENT.key(CLIENT_KEY, user_id)
+        user = datastore.Entity(key=key)
+        user.update({
+            'words': save_word,
+            'count': 1,
+        })
+    user['last_word'] = save_word
+    CLIENT.put(user)
 
 
 def search_reading_from_dic(search_word):

requirements.txt

@@ -1,5 +1,5 @@
 flake8
-google-appengine
+google-cloud-datastore
 pylint
 pyyaml
 webtest