Subversion Repositories SmartDukaan

Rev

Rev 7825 | Rev 7884 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7825 Rev 7883
Line 6... Line 6...
6
from shop2020.model.v1.user.impl import Dataservice
6
from shop2020.model.v1.user.impl import Dataservice
7
from shop2020.utils.Utils import log_entry, to_py_date
7
from shop2020.utils.Utils import log_entry, to_py_date
8
from shop2020.thriftpy.model.v1.user.ttypes import WidgetType as WType
8
from shop2020.thriftpy.model.v1.user.ttypes import WidgetType as WType
9
from shop2020.model.v1.user.impl.Dataservice import User, UserCommunication, \
9
from shop2020.model.v1.user.impl.Dataservice import User, UserCommunication, \
10
    Address, Affiliate, Tracker, TrackLog,\
10
    Address, Affiliate, Tracker, TrackLog,\
11
    MasterAffiliate, UserWidgetItem
11
    MasterAffiliate, UserWidgetItem, FacebookUser
12
from shop2020.thriftpy.model.v1.user.ttypes import UserContextException,\
12
from shop2020.thriftpy.model.v1.user.ttypes import UserContextException,\
13
    AuthenticationException, Sex
13
    AuthenticationException, Sex
14
from elixir import session
14
from elixir import session
15
import datetime
15
import datetime
16
from sqlalchemy import desc
16
from sqlalchemy import desc
Line 79... Line 79...
79
    user.mobile_number = user_to_add.mobileNumber
79
    user.mobile_number = user_to_add.mobileNumber
80
    user.source = user_to_add.source
80
    user.source = user_to_add.source
81
    user.source_start_time = to_py_date(user_to_add.sourceStartTime)
81
    user.source_start_time = to_py_date(user_to_add.sourceStartTime)
82
    user.trust_level = 0
82
    user.trust_level = 0
83
    user.active_since = datetime.datetime.now()
83
    user.active_since = datetime.datetime.now()
-
 
84
    
84
    user.is_facebook_user = user_to_add.isFacebookUser
85
    if user_to_add.isFacebookUser:
-
 
86
        fuser = FacebookUser()
85
    user.facebook_access_token = user_to_add.facebookAccessToken
87
        fuser.facebook_access_token = user_to_add.facebookAccessToken
86
    user.facebook_id = user_to_add.facebookId
88
        fuser.facebook_id = user_to_add.facebookId
-
 
89
        fuser.user = user
87
    session.commit()
90
    session.commit()
88
    return user
91
    return user
89
 
92
 
90
#===============================================================================
93
#===============================================================================
91
# Need to provide the update apis here for relevant fields in PrimaryInfo.
94
# Need to provide the update apis here for relevant fields in PrimaryInfo.
Line 101... Line 104...
101
    user.jsession_id = user_to_update.jsessionId
104
    user.jsession_id = user_to_update.jsessionId
102
    user.is_anonymous = user_to_update.isAnonymous
105
    user.is_anonymous = user_to_update.isAnonymous
103
    user.sex = user_to_update.sex
106
    user.sex = user_to_update.sex
104
    user.date_of_birth = user_to_update.dateOfBirth
107
    user.date_of_birth = user_to_update.dateOfBirth
105
    user.mobile_number = user_to_update.mobileNumber
108
    user.mobile_number = user_to_update.mobileNumber
106
    user.is_facebook_user = user_to_update.isFacebookUser
109
    if user_to_update.isFacebookUser:
-
 
110
        fuser = FacebookUser()
107
    if user_to_update.facebookAccessToken is not None:
111
        if user_to_update.facebookAccessToken is not None:
108
        user.facebook_access_token = user_to_update.facebookAccessToken
112
            fuser.facebook_access_token = user_to_update.facebookAccessToken
109
    if user_to_update.facebookId is not None:
113
        if user_to_update.facebookId is not None:
110
        user.facebook_id = user_to_update.facebookId
114
            fuser.facebook_id = user_to_update.facebookId
-
 
115
        fuser.user = user
111
    session.commit()
116
    session.commit()
112
    return user
117
    return user
113
 
118
 
114
def authenticate_user(user_handle, password):
119
def authenticate_user(user_handle, password):
115
    user = User.get_by(email=user_handle)
120
    user = User.get_by(email=user_handle)
Line 491... Line 496...
491
    for email in emails:
496
    for email in emails:
492
        email_addresses.append(str(email[0]))
497
        email_addresses.append(str(email[0]))
493
    
498
    
494
    return email_addresses
499
    return email_addresses
495
 
500
 
496
def mark_user_as_fb_user(userId):
-
 
497
    user = User.query.filter_by(id = userId).first()
-
 
498
    user.isFacebookUser = True
-
 
499
    session.commit()
-
 
500
    
-
 
501
def close_session():
501
def close_session():
502
    if session.is_active:
502
    if session.is_active:
503
        print "session is active. closing it."
503
        print "session is active. closing it."
504
        session.close()
504
        session.close()
505
 
505