Inspector: inspection queue, Analyzer -> Inspector, logging improvements

Author: DrTom

.mux.yml

@@ -4,7 +4,8 @@ windows:
     name: back-repl-run
     command: |
       export DB_NAME=madek
-      export LOGGING_CONFIG_FILE=log-conf-dev.edn
+      export PGDATAVASE=madek
+      # export LOGGING_CONFIG_FILE=log-conf-dev.edn
       # we need do wait for the front-end to build the assets before we start up
       sleep 30
       ./bin/clj-run run
@@ -15,7 +16,7 @@ windows:
   5:
     name: psql
     command: |
-      psql -d madek_v3
+      psql -d madek
   6:
     name: datalayer
     command: |

datalayer

@@ -8,9 +8,10 @@
   cli-matic/cli-matic {:mvn/version "0.4.3"}
   clj-commons/clj-yaml {:mvn/version "0.7.107"}
   clj-pid/clj-pid {:mvn/version "0.1.2"}
-  cljc.java-time/cljc.java-time {:mvn/version "0.1.16"}
+  ;cljc.java-time/cljc.java-time {:mvn/version "0.1.16"}
   cljs-http/cljs-http {:mvn/version "0.1.46"}
   clojure-humanize/clojure-humanize {:mvn/version "0.2.2"}
+  clojure.java-time/clojure.java-time {:mvn/version "0.3.3"}
   com.codahale.metrics/metrics-core {:mvn/version "3.0.2"}
   com.codahale.metrics/metrics-healthchecks {:mvn/version "3.0.2"}
   com.fzakaria/slf4j-timbre {:mvn/version "0.3.21"}
@@ -21,6 +22,7 @@
   compojure/compojure {:mvn/version "1.6.2"}
   digest/digest {:mvn/version "1.4.10"}
   environ/environ {:mvn/version "1.2.0"}
+  funcool/cuerdas {:mvn/version "2021.05.29-0"}
   hiccup/hiccup {:mvn/version "1.0.5"}
   hikari-cp/hikari-cp {:mvn/version "2.13.0"}
   http-kit/http-kit {:mvn/version "2.5.3"}

deps.edn

@@ -0,0 +1,62 @@
+describe "Inspectors", type: :feature do
+
+  context "CRUD" do
+
+    context "as a system admin" do
+
+      let(:user) { create(:user, :with_system_admin_role) }
+
+      let(:inspector_config) do
+        YAML.load_file(
+          PROJECT_DIR.join("inspector", "config.yml")
+        ).with_indifferent_access
+      end
+
+      let(:media_files_dir) do
+        PROJECT_DIR.join("spec/support/files")
+      end
+
+      before {sign_in}
+
+      context do
+
+        let!(:store) { create(:media_store, :database, :with_users, users: [user]) }
+
+        it 'add an Inspector, upload a jpg', pending: true do
+
+          # Settings
+          visit '/media-service/'
+          click_on 'Settings'
+          click_on 'Edit'
+          fill_in 'upload_max_part_size', with: (100 * 1024)
+          fill_in 'upload_min_part_size', with: 1024
+          click_on 'Save'
+
+
+          # Inspector
+          visit '/media-service/inspectors/'
+          click_on 'Create'
+          fill_in 'id', with: inspector_config[:id]
+          check 'enabled'
+          fill_in 'public_key', with: inspector_config[:'internal-key'][:'public-key']
+          click_on 'Save'
+          expect(page).to have_content 'Inspectors'
+          expect(page).to have_content inspector_config[:id]
+
+
+          # Upload
+          visit '/media-service/'
+          click_on 'Uploads'
+          within "#uploads-page .form" do
+            attach_file nil, media_files_dir.join('AnonPhoto.jpg')
+          end
+
+          binding.pry
+
+        end
+
+      end
+
+    end
+  end
+end

spec/features/inspect_spec.rb

@@ -83,23 +83,23 @@
                                    with: default_upload_min_part_size)
       end
 
-      specify "private_key field is disabled and has no value" do
-        expect(page).to have_field("private_key", type: "text", disabled: true, with: "")
+      specify "key_private field is disabled and has no value" do
+        expect(page).to have_field("key_private", type: "text", disabled: true, with: "")
       end
 
       specify "reset values to default buttons are disabled" do
         expect(page).to have_button("Reset to default", count: 2, disabled: true)
       end
 
       describe "updating settings" do
-        let(:private_key) { "PRIVATE_KEY_!@#" }
+        let(:key_private) { "PRIVATE_KEY_!@#" }
 
         it "updates them" do
           click_link "Edit"
 
           fill_in "upload_max_part_size", with: 12 * 1024 ** 2
           fill_in "upload_min_part_size", with: 10 * 1024 ** 2
-          fill_in "private_key", with: private_key
+          fill_in "key_private", with: key_private
 
           click_button "Save"
 
@@ -111,7 +111,7 @@
                                      type: "number",
                                      disabled: true,
                                      with: 10 * 1024 ** 2)
-          expect(page).to have_field("private_key", type: "text", disabled: true, with: private_key)
+          expect(page).to have_field("key_private", type: "text", disabled: true, with: key_private)
         end
       end
 

spec/features/settings_spec.rb

@@ -34,10 +34,14 @@
     end
 
     it "allows to upload a file" do
+      expect(true).to be
+      binding.pry
+
       within "#uploads-page .form" do
         attach_file nil, "spec/support/files/small.txt"
       end
 
+
       expect(page).to have_css(".modal-body",
                                text: /POST \/media-service\/uploads\/[a-z0-9-]+\/complete/)
       expect(page).to have_link("Original", href: /\/media-service\/originals\/[a-z0-9-]+$/)

spec/features/uploads_spec.rb

@@ -73,9 +73,8 @@ def upload_get_request
       expect(response.status).to eq(200)
     end
 
-    it "responds with media file details" do
-      expect(without_timestamps(response.body)).to match({
-        id: a_kind_of(String),
+    let(:media_file_response_map) do
+      { id: a_kind_of(String),
         height: nil,
         size: file_size,
         width: nil,
@@ -86,12 +85,17 @@ def upload_get_request
         guid: nil,
         extension: nil,
         media_type: nil,
+        media_store_type: store.type,
         media_entry_id: nil,
         uploader_id: user.id,
         conversion_profiles: [],
         media_store_id: store.id,
-        sha256: Digest::SHA256.hexdigest(file)
-      }.stringify_keys)
+        sha256: Digest::SHA256.hexdigest(file)}
+    end
+
+    it "responds with media file details" do
+      expect(without_timestamps(response.body)).to \
+        match(media_file_response_map.stringify_keys)
     end
   end
 

spec/requests/originals_spec.rb

@@ -60,7 +60,9 @@
         it "returns settings" do
           expect(without_timestamps(parsed_body)).to eq({
             id: 0,
-            private_key: nil,
+            key_private: nil,
+            key_public: nil,
+            key_algo: nil,
             upload_min_part_size: 1024 ** 2,
             upload_max_part_size: 100 * 1024 ** 2,
           }.deep_stringify_keys)
@@ -71,7 +73,9 @@
         let(:params) do
           {
             id: 0,
-            private_key: "PRIVATE_KEY",
+            key_private: "PRIVATE_KEY",
+            key_public: "PUBLIC_KEY",
+            key_algo: nil,
             upload_min_part_size: 10 * 1024 ** 2,
             upload_max_part_size: 12 * 1024 ** 2
           }

spec/requests/settings_spec.rb

@@ -1,5 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 
+PROJECT_DIR= Pathname(File.expand_path(File.dirname(__FILE__) + ("/..")))
+
 def base_url
   @base_url ||= ENV['MADEK_MEDIA_SERVICE_HTTP_BASE_URL'].presence || 'http://localhost:3180'
 end