Added delete of items.Part 1

classes/db.rb

@@ -326,4 +326,21 @@ class DBase
   def get_rpms()
     Rpms.order(:id).all
   end
+
+  def get_builds_for_project(prj_id)
+    $DDB["select t1.id as buildid, t1.create_at as createat, t1.result as state, t2.reponame as reponame, t2.id as gitid, t3.id as projid, t3.projname as prjname, count(*) as pkgcnt from buildtask as t1 join repos as t2 on t1.repo_id = t2.id join projects as t3 on t1.proj_id = t3.id join build_rpm as t4 on t4.build_id = t1.id where t1.proj_id = ? group by buildid, createat, state, reponame, projid, prjname, gitid order by t1.id", prj_id.to_i].all
+  end
+
+  def get_builds_for_project_git(prj_id, git_id)
+    $DDB["select t1.id as buildid, t1.create_at as createat, t1.result as state, t2.reponame as reponame, t2.id as gitid, t3.id as projid, t3.projname as prjname, count(*) as pkgcnt from buildtask as t1 join repos as t2 on t1.repo_id = t2.id join projects as t3 on t1.proj_id = t3.id join build_rpm as t4 on t4.build_id = t1.id where t1.proj_id = ? and t1.repo_id = ? group by buildid, createat, state, reponame, projid, prjname, gitid order by t1.id", prj_id.to_i, git_id.to_i].all
+  end
+
+  def get_builds_for_project_git_rpm(prj_id, git_id)
+    $DDB["select t3.savepath, t3.signpath, t3.sign from buildtask as t1 join build_rpm as t2 on t2.build_id = t1.id join rpms as t3 on t3.id = t2.rpm_id where t1.proj_id = ? and t1.repo_id = ?", prj_id.to_i, git_id.to_i].all
+  end
+
+  def delete_git_from_project(prj_id, git_id)
+    ReposProjects.where(proj_id: prj_id.to_i, repo_id: git_id.to_i).delete
+    ProjectsReposSpec.where(proj_id: prj_id.to_i, repo_id: git_id.to_i).delete
+  end
 end

classes/mock.rb

@@ -211,8 +211,8 @@ class MockManager
             FileUtils.cp_r(item[:src], item[:dst], verbose: true, remove_destination: true)
             @db.save_rpm(@build_id, item[:dst], item[:name], @git_id)
             @log.info("Копируется пакет #{item[:src]} в репозиторий #{item[:dst]}")
+            repo.create_repo
           end
-          repo.create_repo
         end
       end
     end

classes/projects.rb

@@ -65,6 +65,11 @@ class ProjectsActions
     fname
   end
 
+  def get_project_repo(id)
+    proj_path = get_project_path(id)
+    File.join(proj_path, PROJECTS_STRUCTURE[:REPO])
+  end
+
   def get_project_path_git(id, gitname)
     proj_path = get_project_path(id)
     File.join(proj_path, PROJECTS_STRUCTURE[:SRC], gitname)
@@ -314,4 +319,25 @@ class ProjectsActions
     end
     bld_id
   end
+
+  def delete_git_from_project(prj_id, git_id)
+    @error = nil
+    builds_lst = db.get_builds_for_project_git(prj_id, git_id)
+    active_build = false
+    builds_lst.each do |item|
+      if item[:state] == 0
+        active_build = true
+        break
+      end
+    end
+    if active_build
+      @error = "Нельзя удалить git репозиторий с незавершенными сборками"
+    else
+      git_name = @db.get_repo_info_by_id(git_id)
+      git_source = File.join(proj_path, PROJECTS_STRUCTURE[:SRC], git_name[:reponame])
+      FileUtils.rm_rf(git_source, secure: true)
+      @db.delete_git_from_project(prj_id, git_id)
+    end
+    @error
+  end
 end