Generator/admin-panel: generate versions pushed without flags

Author: ilevd

src-cljc/playground/utils/utils.cljc

@@ -1,5 +1,6 @@
 (ns playground.utils.utils
   (:require [clojure.string :as string]
+            [version-clj.core :as version-clj]
     #?(:cljs
        [cljs-time.coerce :as c]
        :clj
@@ -32,6 +33,11 @@
   (filter released-or-8-version? versions))
 
 
+(defn sort-versions [versions]
+  (sort (comp - #(version-clj/version-compare %1 %2))
+        versions))
+
+
 (defn replace-urls [version-name scripts]
   (map (fn [script]
          (if (= script "../anychart-bundle.min.js")

src/playground/db/request.clj

@@ -127,6 +127,9 @@
                         :result-set-fn first
                         :row-fn        underscore->dash}))
 
+(def repo-update-actual-versions! (sql {:name sql-repo-update-actual-versions!}))
+
+
 ;; =====================================================================================================================
 ;; Versions
 ;; =====================================================================================================================

src/playground/generator/core.clj

@@ -264,15 +264,18 @@
     update-branches))
 
 
-(defn need-update-branch [branch]
-  (or (utils/released-version? (:name branch))
+(defn need-update-branch [branch repo gen-params]
+  (or (and (= (:name @repo) (:repo gen-params))
+           (= (:name branch) (:version gen-params)))
+      (utils/released-version? (:name branch))
       (= (:name branch) "develop")
       (= (:name branch) "master")
       (string/includes? (:message branch) "#pg")
       (string/includes? (:message branch) "#all")))
 
 
-(defn names [branches] (map :name branches))
+(defn names [branches]
+  (doall (map :name branches)))
 
 
 (defn update-repository [generator db repo gen-params]
@@ -288,14 +291,16 @@
                               branch-list)
             db-branches (db-req/versions db {:repo-id (:id @repo)})
             changed-branches (changed-branches actual-branches db-branches)
-            updated-branches (filter need-update-branch changed-branches)
+            updated-branches (filter #(need-update-branch % repo gen-params) changed-branches)
             removed-branches (branches-for-remove actual-branches db-branches)]
         (info "Branch list: " (pr-str (names branch-list)))
         (info "Actual branches: " (pr-str (names actual-branches)))
         (info "DB branches: " (pr-str (names db-branches)))
         (info "Changed branches: " (pr-str (names changed-branches)))
         (info "Updated branches: " (pr-str (names updated-branches)))
         (info "Removed branches: " (pr-str (names removed-branches)))
+        (db-req/repo-update-actual-versions! db {:id       (:id @repo)
+                                                 :versions (utils/sort-versions (names actual-branches))})
         (notifier/start-build (:notifier generator)
                               (:name @repo)
                               (names changed-branches)

src/playground/web/handlers/admin_handlers.clj

@@ -17,8 +17,9 @@
 ;; API
 (defn versions [request]
   (let [project (-> request :params :project)
-        versions (db-req/versions-by-repo-name (get-db request) {:name project})]
-    versions))
+        ; versions (db-req/versions-by-repo-name (get-db request) {:name project})
+        repo (db-req/repo-by-name (get-db request) {:name project})]
+    (->> repo :actual-versions (into '()) reverse)))
 
 
 (defn delete-version [request]
@@ -28,7 +29,8 @@
         branch (db-req/version-by-name (get-db request) {:repo-id (:id repo)
                                                          :name    version})]
     (timbre/info "Delete version request: " project version)
-    (db-actions/remove-branch (get-db request) branch)
+    (when branch
+      (db-actions/remove-branch (get-db request) branch))
     (web-utils/response {:status :ok})))
 
 
@@ -39,7 +41,8 @@
         branch (db-req/version-by-name (get-db request) {:repo-id (:id repo)
                                                          :name    version})]
     (timbre/info "Rebuild version request: " project version)
-    (db-actions/remove-branch (get-db request) branch)
+    (when branch
+      (db-actions/remove-branch (get-db request) branch))
     (redis/enqueue (get-redis request)
                    (get-redis-queue request)
                    {:repo    project

src/sql/queries/repos.sql

@@ -5,4 +5,7 @@ INSERT INTO repos (name, title, templates, owner_id) VALUES (:name, :title, :tem
 SELECT * FROM repos ORDER BY title;
 
 -- name: sql-repo-by-name
-SELECT * FROM repos WHERE name = :name;
+SELECT * FROM repos WHERE name = :name;
+
+-- name: sql-repo-update-actual-versions!
+UPDATE repos SET actual_versions = :versions WHERE id = :id;

src/sql/queries/samples.sql

@@ -88,7 +88,7 @@ ORDER BY version DESC;
 -- INSERT INTO samples (name, description, short_description, tags, export, scripts, local_scripts, styles, code_type, code, style_type, style, markup_type, markup) VALUES :values;
 
 -- name: sql-delete-samples!
-DELETE FROM samples WHERE version_id = :version_id;
+DELETE FROM samples WHERE version_id IS NOT NULL AND version_id = :version_id;
 
 
 

src/sql/schema_postgre.sql

@@ -29,7 +29,8 @@ CREATE TABLE repos (
   title VARCHAR(100),
   templates BOOLEAN,
   owner_id BIGINT REFERENCES users(id),
-  create_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+  create_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  actual_versions VARCHAR(256)[] -- for admin panel - to display all versions
 );