|
@@ -48,10 +48,16 @@ class UserBrandV2(View):
|
|
|
osType = request_dict.get('osType', None)
|
|
|
osVersion = request_dict.get('osVersion', None)
|
|
|
|
|
|
- if userID and deviceSupplier and deviceModel:
|
|
|
+ if userID and deviceSupplier and deviceModel and osType and osVersion:
|
|
|
ub_qs = User_Brand.objects.filter(userID=userID)
|
|
|
if ub_qs.exists():
|
|
|
- ub_qs.update(deviceSupplier=deviceSupplier, deviceModel=deviceModel)
|
|
|
+ update = {
|
|
|
+ 'deviceSupplier': deviceSupplier,
|
|
|
+ 'deviceModel': deviceModel,
|
|
|
+ 'osType': osType,
|
|
|
+ 'osVersion': osVersion
|
|
|
+ }
|
|
|
+ ub_qs.update(**update)
|
|
|
return response.json(0)
|
|
|
else:
|
|
|
user = Device_User.objects.filter(userID=userID)
|
|
@@ -60,7 +66,9 @@ class UserBrandV2(View):
|
|
|
data = {
|
|
|
'userID': user[0],
|
|
|
'deviceSupplier': deviceSupplier,
|
|
|
- 'deviceModel': deviceModel
|
|
|
+ 'deviceModel': deviceModel,
|
|
|
+ 'osType': osType,
|
|
|
+ 'osVersion': osVersion
|
|
|
}
|
|
|
User_Brand.objects.create(**data)
|
|
|
return response.json(0)
|
|
@@ -75,6 +83,6 @@ class UserBrandV2(View):
|
|
|
ub_qs = User_Brand.objects.filter(userID=userID)
|
|
|
data = None
|
|
|
if ub_qs.exists():
|
|
|
- data = ub_qs.values('id', 'deviceSupplier', 'deviceModel')[0]
|
|
|
+ data = ub_qs.values('id', 'deviceSupplier', 'deviceModel', 'osType', 'osVersion')[0]
|
|
|
|
|
|
return response.json(0, {'data': data})
|