WebSVN – SmartDukaan – Diff – /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py

 @author: ashish
 '''
 from shop2020.model.v1.user.impl import Dataservice
 from shop2020.utils.Utils import log_entry, to_py_date
 from shop2020.thriftpy.model.v1.user.ttypes import WidgetType as WType
-from shop2020.model.v1.user.impl.Dataservice import User, UserCommunication, IPMap,\
+from shop2020.model.v1.user.impl.Dataservice import User, UserCommunication, \
-    Address, SocialHandle, UserState, InternalInfo, SocialService, Affiliate, Tracker, TrackLog,\
+    Address, Affiliate, Tracker, TrackLog,\
     MasterAffiliate, UserNote, UserWidgetItem
 from shop2020.thriftpy.model.v1.user.ttypes import UserContextException,\
     AuthenticationException, AccountStatus, Sex
 from elixir import session
 import datetime
 from sqlalchemy import desc
+from shop2020.model.v1.user.impl.CartDataAccessors import create_cart
 def initialize(dbname='user', db_hostname="localhost"):
     log_entry("initialize@DataAccessor", "Initializing data service")
     Dataservice.initialize(dbname, db_hostname)
-def create_anonymous_user(jsession_id, cart):
+def create_anonymous_user(jsession_id):
     user=User.get_by(jsession_id=jsession_id)
     #user=User.query.with_lockmode("update").filter_by(jsession_id=jsession_id)
     if not user is None:
         return user
+    cart = create_cart()
     user = User()
     anonymous_str = "anonymous"
     user.email = jsession_id + "@anonymous.com"
     user.password = anonymous_str
     user.name = anonymous_str
     user.communication_email = jsession_id + "@anonymous.com"
     user.jsession_id = jsession_id
     user.is_anonymous = True
     user.sex = Sex.WONT_SAY
-    user.active_cart_id = cart.id
+    user.active_cart = cart
     user.trust_level = 0
-    #initialize userState
-    user_state = UserState()
-    user_state.is_email_verified = False
-    user_state.is_sms_verified = False
-    user_state.account_status = AccountStatus.ACTIVE
-    user_state.ip_list = []
-    user_state.active_since = datetime.datetime.now()
+    user.active_since = datetime.datetime.now()
-    user_state.user = user
     session.commit()
-    cart.user_id = user.id
-    session.commit()
     return user
 def get_user_by_id(user_id):
     return User.get_by(id=user_id)
+def get_user_by_cart_id(cart_id):
+    return User.get_by(active_cart_id=cart_id)
 def get_user_by_mobile_number(mobile_number):
     return User.get_by(mobile_number=mobile_number)
 def get_user_by_email(email):
     return User.get_by(email=email)
-def create_user(user_to_add, cart):
+def create_user(user_to_add):
-    if user_to_add.userId:
-        raise UserContextException(109, "id is set, user cannot be created")
     if user_exists(user_to_add.email):
         raise UserContextException(109, "User already exists with this email id.")
+    cart = create_cart()
     user = User()
     user.email = user_to_add.email
     user.password = user_to_add.password
     user.name = user_to_add.name
     user.communication_email = user_to_add.communicationEmail
     user.jsession_id = user_to_add.jsessionId
     user.is_anonymous = False
     user.sex = user_to_add.sex
     user.date_of_birth = user_to_add.dateOfBirth
-    user.active_cart_id = cart.id
+    user.active_cart = cart
     user.mobile_number = user_to_add.mobileNumber
     user.source = user_to_add.source
     user.source_start_time = to_py_date(user_to_add.sourceStartTime)
     user.trust_level = 0
-    #initialize userState
-    user_state = UserState()
-    user_state.is_email_verified = False
-    user_state.is_sms_verified = False
-    user_state.account_status = AccountStatus.ACTIVE
-    user_state.ip_list = []
-    user_state.active_since = datetime.datetime.now()
+    user.active_since = datetime.datetime.now()
-    user_state.user = user
-    session.commit();
-    #Now create the user phones. Mostly, this should only be a mobile number
-    cart.user_id = user.id
     session.commit()
     return user
 #===============================================================================
 # Need to provide the update apis here for relevant fields in PrimaryInfo.
 #===============================================================================
     user.communication_email = user_to_update.communicationEmail
     user.jsession_id = user_to_update.jsessionId
     user.is_anonymous = user_to_update.isAnonymous
     user.sex = user_to_update.sex
     user.date_of_birth = user_to_update.dateOfBirth
-    user.active_cart_id = user_to_update.activeCartId
     user.mobile_number = user_to_update.mobileNumber
     session.commit()
     return user
-def delete_user(user_id):
-    user = get_user_by_id(user_id)
-    if not user:
-        raise_user_exception(user_id)
-    user.state.account_status = AccountStatus.DELETED
-    session.commit()
-    return True
-def get_user_state(user_id):
-    userstate = UserState.get_by(user_id=user_id)
-    return userstate
-def get_internal_info(user_id):
-    info = InternalInfo.get_by(user_id=user_id)
-    return info
 def authenticate_user(user_handle, password):
     user = User.get_by(email=user_handle)
     if not user:
         raise AuthenticationException("This email address is not registered.", 102)
     address.enabled = False
     session.commit()
     return True
 def set_user_as_logged_in(user_id, time_stamp):
-    user_state = UserState.get_by(user_id=user_id)
-    #user = get_user_by_id(user_id)
+    user = User.get_by(id=user_id)
-    if not user_state:
+    if not user:
         raise_user_exception(user_id)
     if not time_stamp:
-        user_state.last_login = datetime.datetime.now()
+        user.last_login = datetime.datetime.now()
     else:
-        user_state.last_login = to_py_date(time_stamp)
+        user.last_login = to_py_date(time_stamp)
     session.commit()
     return True
 def set_user_as_logged_out(user_id, time_stamp):
-    user_state = UserState.get_by(user_id=user_id)
+    user = User.get_by(id=user_id)
-    if not user_state:
+    if not user:
         raise_user_exception(user_id)
     if not time_stamp:
-        user_state.last_logout = datetime.datetime.now()
+        user.last_logout = datetime.datetime.now()
     else:
-        user_state.last_logout = to_py_date(time_stamp)
+        user.last_logout = to_py_date(time_stamp)
     session.commit()
     return True
 def set_default_address(user_id, address_id):
     user = get_user_by_id(user_id)
 def get_address(address_id):
     address = Address.get_by(id=address_id)
     return address
-def get_social_service(service_id):
-    service = SocialService.get_by(service_id)
-    return service
-def add_ip_address_for_user(ip_address, time_stamp, user_id):
-    user = get_user_by_id(user_id)
-    if not user:
-        raise_user_exception(user_id)
-    #user exists create an IP address object
-    ip_address = IPMap()
-    ip_address.ip = ip_address
-    ip_address.timestamp = to_py_date(time_stamp)
-    ip_address.user_state = user.state
-    session.commit()
-    return True
-def get_social_service_by_name(service_name):
-    service = SocialService.get_by(name=service_name)
-    if not service:
-        raise UserContextException(106, "No such social service exists")
-    return service
-def add_social_handle(user_id, social_service, handle):
-    user = get_user_by_id(user_id)
-    if not user:
-        raise_user_exception(user_id)
-    service = get_social_service_by_name(social_service)
-    #get if use already has this service.
-    social_handle = SocialHandle.filter(service=service).filter(user=user).one()
-    if not social_handle:
-        #create a new handle
-        social_handle = SocialHandle()
-        social_handle.service = service
-        social_handle.user = user
-        social_handle.handle = handle
-    else:
-        social_handle.handle = handle
-    session.commit()
-    return True
 def forgot_password(email, password):
     try:
         user = User.get_by(email=email)
         if user:
             user.password = password
         else:
             return False
     except:
         return False
-'''
-def forgot_password(email):
-    try:
-        user = User.get_by(email=email)
-        if user:
-            new_password = ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(8))
-            mail = Mail()
-            mail.to = []
-            mail.to.append(email)
-            mail.sender = ""
-            mail.password = ""
-            mail.data = "Your new password is " + user.password
-            helper_client = HelperClient()
-            helper_client.__start__()
-            client = helper_client.get_client()
-            client.sendMail(mail);
-            return True
-        else:
-            return False
-    except:
-        return False
-'''
 def get_all_addresses_for_user(userId):
     return Address.query.filter_by(user_id = userId, enabled=True).all()
 def get_default_address_id(userId):
     user = get_user_by_id(userId);
         return User.query.count()
     else:
         return User.query.filter_by(is_anonymous = user_type).count()
 def get_users(user_type, start_date, end_date):
-    query = session.query(User).join(UserState)
+    query = session.query(User)
     if start_date != -1:
-        query = query.filter(UserState.active_since >= to_py_date(start_date))
+        query = query.filter(User.active_since >= to_py_date(start_date))
     if end_date != -1:
-        query = query.filter(UserState.active_since <= to_py_date(end_date))
+        query = query.filter(User.active_since <= to_py_date(end_date))
     if user_type is not None:
         query = query.filter(User.is_anonymous == user_type)
     return query.all()
 #=============================================================================

Subversion Repositories SmartDukaan

(root)/trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py – Rev 5036 → 5326