Merge pull request #1121 from yyyangw/feature/filter_and_associate_de…

…letion

增加“筛选未删除项目的分析方案”功能以及解决“删除代码库无法关联软删除分析项目和分析模板”的问题

server/projects/main/apps/codeproj/apis/v3_scheme.py

@@ -104,7 +104,8 @@ def get_queryset(self):
         scan_scheme = self.get_scheme()
         # 获取活跃的分析方案
         return models.ScanScheme.objects.filter(refer_scheme=scan_scheme, repo__isnull=False,
-                                                status=models.ScanScheme.StatusEnum.ACTIVE)
+                                                status=models.ScanScheme.StatusEnum.ACTIVE).exclude(
+            repo__deleted_time__isnull=False)
 
 
 class ScanSchemePushApiView(generics.GenericAPIView, V3GetModelMixinAPIView):

server/projects/main/apps/codeproj/core/projmgr.py

@@ -249,6 +249,10 @@ def delete_repo(cls, repo_id, user):
         deleted_time = now()
         repo.scm_url = ("%s [deleted by %s(%s)]" % (repo.scm_url, user.username, deleted_time))[:198]
         repo.save()
+        models.Project.objects.filter(repo_id=repo_id).delete()
+        logger.info("[User: %s] 在 %s 删除了代码库 %s-%s 关联的扫描项目" % (user.username, deleted_time, repo_id, old_scm_url))
+        models.ScanScheme.objects.filter(repo_id=repo_id).delete()
+        logger.info("[User: %s] 在 %s 删除了代码库 %s-%s 关联的扫描方案" % (user.username, deleted_time, repo_id, old_scm_url))
         logger.info("[User: %s] 在 %s 删除了代码库 %s-%s" % (user.username, deleted_time, repo_id, old_scm_url))
         repo.delete(user=user)
         OperationRecordHandler.add_repo_operation_record(