|
|
@@ -452,15 +452,18 @@ class DeviceManagement(View):
|
|
|
lang = request_dict.get('lang', None)
|
|
|
app_bundle_id = request_dict.get('appBundleId', None)
|
|
|
version_number = request_dict.get('versionNumber', None)
|
|
|
-
|
|
|
if not all([lang, app_bundle_id, version_number]):
|
|
|
return response.json(444)
|
|
|
- version_number_qs = AppVersionNumber.objects.filter(version_number=version_number)
|
|
|
+ version_number_qs = AppVersionNumber.objects.filter(app_bundle__app_bundle_id=app_bundle_id,
|
|
|
+ version_number=version_number)
|
|
|
if not version_number_qs.exists():
|
|
|
- version_number_qs = AppVersionNumber.objects.values('version_number')
|
|
|
- test_list = [item[key] for item in version_number_qs for key in item]
|
|
|
+ version_number_qs = AppVersionNumber.objects.filter(app_bundle__app_bundle_id=app_bundle_id)
|
|
|
+ if not version_number_qs.exists():
|
|
|
+ return response.json(173)
|
|
|
+ version_qs = version_number_qs.values('version_number')
|
|
|
+ test_list = [item[key] for item in version_qs for key in item]
|
|
|
if (version_number > test_list[-1] or version_number < test_list[0]):
|
|
|
- version_number_qs = AppVersionNumber.objects.filter().values('id').order_by('id')
|
|
|
+ version_number_qs = version_number_qs.filter().values('id').order_by('id')
|
|
|
total_list = [item[key] for item in version_number_qs for key in item]
|
|
|
version_number_id = total_list[-1]
|
|
|
else:
|
|
|
@@ -476,7 +479,6 @@ class DeviceManagement(View):
|
|
|
version_number_qs = AppVersionNumber.objects.filter(version_number=version_number).values('id')
|
|
|
version_number_id = version_number_qs[0]['id']
|
|
|
try:
|
|
|
-
|
|
|
app_bundle_qs = AppBundle.objects.filter(app_bundle_id=app_bundle_id,
|
|
|
app_device_type__devicenamelanguage__lang=lang,
|
|
|
app_device_type__app_version_number_id=version_number_id). \
|
