diff --git a/dongtai_conf/settings.py b/dongtai_conf/settings.py index 891654c59..3adae9434 100644 --- a/dongtai_conf/settings.py +++ b/dongtai_conf/settings.py @@ -404,37 +404,49 @@ def safe_execute(default, exception, function, *args): 'loggers': { 'django.db.backends': { 'handlers': ['console'], - 'level': LOGGING_LEVEL, + 'level': "DEBUG" if DEBUG else LOGGING_LEVEL, 'propagate': False, 'encoding': "utf-8", }, 'dongtai-webapi': { - 'handlers': ['console', ], + 'handlers': [ + 'console', + ], 'propagate': True, 'level': LOGGING_LEVEL, }, 'dongtai.openapi': { - 'handlers': ['console', ], + 'handlers': [ + 'console', + ], 'propagate': True, 'level': LOGGING_LEVEL, }, 'dongtai-core': { - 'handlers': ['console', ], + 'handlers': [ + 'console', + ], 'propagate': True, 'level': LOGGING_LEVEL, }, 'django': { - 'handlers': ['console', ], + 'handlers': [ + 'console', + ], 'level': LOGGING_LEVEL, 'propagate': True, }, 'dongtai-engine': { - 'handlers': ['console', ], + 'handlers': [ + 'console', + ], 'propagate': True, 'level': LOGGING_LEVEL, }, 'celery.apps.worker': { - 'handlers': ['console', ], + 'handlers': [ + 'console', + ], 'propagate': True, 'level': LOGGING_LEVEL, }, diff --git a/dongtai_web/dongtai_sca/scan/tests.py b/dongtai_web/dongtai_sca/scan/tests.py index 875b7399a..9a2645447 100644 --- a/dongtai_web/dongtai_sca/scan/tests.py +++ b/dongtai_web/dongtai_sca/scan/tests.py @@ -188,14 +188,14 @@ def test_update_one_sca_java_result_search3(self): "/Users/xxx/spring-boot/2.3.2.RELEASE/com.amazon.redshift:redshift-jdbc42.jar", "9179edbad62154d04d4be20f0c0e2fb1fc637710", "com.amazon.redshift:redshift-jdbc42.jar", "SHA-1") - - def test_update_one_sca_java_result_search3(self): + + def test_update_one_sca_java_result_search4(self): new_update_one_sca( self.agent_id, "/Users/xxx/spring-boot/2.3.2.RELEASE/com.amazon.redshift:redshift-jdbc42.jar", "5a7674517dd621cc60a000898341b03c41b7034b", "com.amazon.redshift:redshift-jdbc42.jar", "SHA-1") - + def test_update_one_sca_java_same_package(self): new_update_one_sca( self.agent_id, diff --git a/dongtai_web/dongtai_sca/scan/utils.py b/dongtai_web/dongtai_sca/scan/utils.py index e3f0b4c82..419dc979b 100644 --- a/dongtai_web/dongtai_sca/scan/utils.py +++ b/dongtai_web/dongtai_sca/scan/utils.py @@ -921,9 +921,11 @@ def get_license_list(license_list_str: str) -> List[Dict]: def get_license_list_v2(license_list: Tuple[str]) -> List[Dict]: - res = list( - filter(lambda x: x is not None, - map(lambda x: LICENSE_DICT.get(x, None), license_list))) + filter_none: Callable[[Optional[Dict]], bool] = lambda x: x is not None + res = [ + LICENSE_DICT[license] for license in license_list + if license in LICENSE_DICT + ] return res #return [{ # 'identifier': "无", diff --git a/dongtai_web/dongtai_sca/views/newpackage.py b/dongtai_web/dongtai_sca/views/newpackage.py index 61787a7f6..f6345ae82 100644 --- a/dongtai_web/dongtai_sca/views/newpackage.py +++ b/dongtai_web/dongtai_sca/views/newpackage.py @@ -80,12 +80,12 @@ def post(self, request): except ValidationError as e: return R.failure(data=e.detail) q = Q() - if 'level_id' in ser.validated_data: - q = q & Q(level_id__in=ser.validated_data['level_id']) - if 'language_id' in ser.validated_data: - q = q & Q(language_id__in=ser.validated_data['language_id']) - if 'license_id' in ser.validated_data: - q = q & Q(license_id__in=ser.validated_data['license_id']) + if 'level_ids' in ser.validated_data: + q = q & Q(level_id__in=ser.validated_data['level_ids']) + if 'language_ids' in ser.validated_data: + q = q & Q(language_id__in=ser.validated_data['language_ids']) + if 'license_ids' in ser.validated_data: + q = q & Q(license_id__in=ser.validated_data['license_ids']) if 'project_id' in ser.validated_data: q = q & Q(assetv2__project_id=ser.validated_data['project_id']) if 'project_version_id' in ser.validated_data: diff --git a/dongtai_web/dongtai_sca/views/newpackagesummary.py b/dongtai_web/dongtai_sca/views/newpackagesummary.py index 101cd4f92..6811bfd59 100644 --- a/dongtai_web/dongtai_sca/views/newpackagesummary.py +++ b/dongtai_web/dongtai_sca/views/newpackagesummary.py @@ -106,8 +106,8 @@ def get(self, request): license_q = license_q & Q( asset__assetv2__project_id=ser.validated_data['project_id']) if 'project_version_id' in ser.validated_data: - q = q & Q( - assetv2__project_version_id=ser.validated_data['project_id']) + q = q & Q(assetv2__project_version_id=ser. + validated_data['project_version_id']) license_q = license_q & Q(asset__assetv2__project_version_id=ser. validated_data['project_version_id']) queryset = AssetV2Global.objects.filter(q)