Add client for erdbeere

.vscode/settings.json

@@ -118,6 +118,7 @@
         "cospeakers",
         "datetime",
         "dockerfiles",
+        "Erdbeere",
         "factorybot",
         "helpdesk",
         "justfile",

app/controllers/erdbeere_controller.rb

@@ -8,31 +8,31 @@ def current_ability
   end
 
   def show_example
-    response = Faraday.get(ENV.fetch("ERDBEERE_API") + "/examples/#{params[:id]}")
+    response = Clients::ErdbeereClient.get("examples/#{params[:id]}")
     @content = if response.status == 200
       JSON.parse(response.body)["embedded_html"]
     else
-      "Something went wrong."
+      I18n.t("erdbeere.error")
     end
   end
 
   def show_property
-    response = Faraday.get(ENV.fetch("ERDBEERE_API") + "/properties/#{params[:id]}")
+    response = Clients::ErdbeereClient.get("properties/#{params[:id]}")
 
     @content = if response.status == 200
       JSON.parse(response.body)["embedded_html"]
     else
-      "Something went wrong."
+      I18n.t("erdbeere.error")
     end
   end
 
   def show_structure
     params[:id]
-    response = Faraday.get(ENV.fetch("ERDBEERE_API") + "/structures/#{params[:id]}")
+    response = Clients::ErdbeereClient.get("structures/#{params[:id]}")
     @content = if response.status == 200
       JSON.parse(response.body)["embedded_html"]
     else
-      "Something went wrong."
+      I18n.t("erdbeere.error")
     end
   end
 
@@ -51,11 +51,10 @@ def cancel_edit_tags
   def display_info
     @id = params[:id]
     @sort = params[:sort]
-    response = Faraday.get(ENV.fetch("ERDBEERE_API") +
-                           "/#{@sort.downcase.pluralize}/#{@id}/view_info")
+    response = Clients::ErdbeereClient.get("#{@sort.downcase.pluralize}/#{@id}/view_info")
     @content = JSON.parse(response.body)
     if response.status != 200
-      @info = "Something went wrong"
+      @info = I18n.t("erdbeere.error")
       return
     end
     @info = if @sort == "Structure"
@@ -87,7 +86,7 @@ def update_tags
   end
 
   def fill_realizations_select
-    response = Faraday.get("#{ENV.fetch("ERDBEERE_API")}/structures/")
+    response = Clients::ErdbeereClient.get("structures")
     @tag = Tag.find_by(id: params[:id])
     hash = JSON.parse(response.body)
     @structures = hash["data"].map do |d|
@@ -102,11 +101,11 @@ def fill_realizations_select
   end
 
   def find_example
-    response = Faraday.get("#{ENV.fetch("ERDBEERE_API")}/find?#{find_params.to_query}")
+    response = Clients::ErdbeereClient.get("find?#{find_params.to_query}")
     @content = if response.status == 200
       JSON.parse(response.body)["embedded_html"]
     else
-      "Something went wrong."
+      I18n.t("erdbeere.error")
     end
   end
 

app/controllers/lectures_controller.rb

@@ -227,7 +227,12 @@ def edit_structures
 
   def search_examples
     if @lecture.structure_ids.any?
-      response = Faraday.get("#{ENV.fetch("ERDBEERE_API")}/search")
+      response = Clients::ErdbeereClient.get("search")
+      if response.status != 200
+        @erdbeere_error = true
+        render layout: "application"
+        return
+      end
       @form = JSON.parse(response.body)["embedded_html"]
       # rubocop:disable Style/StringConcatenation
       @form.gsub!("token_placeholder",
@@ -422,12 +427,12 @@ def eager_load_stuff
 
     def set_erdbeere_data
       @structure_ids = @lecture.structure_ids
-      response = Faraday.get("#{ENV.fetch("ERDBEERE_API")}/structures")
-      response_hash = if response.status == 200
-        JSON.parse(response.body)
-      else
-        { "data" => {}, "included" => {} }
+      response = Clients::ErdbeereClient.get("structures")
+      if response.status != 200
+        @erdbeere_error = true
+        return
       end
+      response_hash = JSON.parse(response.body)
       @all_structures = response_hash["data"]
       @structures = @all_structures.select do |s|
         s["id"].to_i.in?(@structure_ids)

app/views/lectures/edit_structures.coffee

@@ -1,3 +1,7 @@
+<% if @erdbeere_error %>
+  $('#erdbeereStructuresBody').empty()
+  .append('<%= t("erdbeere.error") %>')
+<% else %>
 $('#erdbeereStructuresBody').empty()
 .append('<%= j render partial: "lectures/edit/structures",
                       locals: { lecture: @lecture,
@@ -31,4 +35,5 @@ renderMathInElement structuresBody,
   throwOnError: false
 
 initBootstrapPopovers()
-registerErdbeereExampleChanges()
+registerErdbeereExampleChanges()
+<% end %>

app/views/lectures/search_examples.html.erb

@@ -1,11 +1,15 @@
-<div class="row p-2 mb-3">
-  <div class="col-12">
-    <%= link_to t('erdbeere.structure_index'),
-                show_structures_path(@lecture),
-                class: 'btn btn-lg btn-outline-secondary' %>
+<% if @erdbeere_error %>
+  <%= t("erdbeere.error") %>
+<% else %>
+  <div class="row p-2 mb-3">
+    <div class="col-12">
+      <%= link_to t('erdbeere.structure_index'),
+                  show_structures_path(@lecture),
+                  class: 'btn btn-lg btn-outline-secondary' %>
+    </div>
   </div>
-</div>
-<%= raw(@form) %>
-<span id="lectureStructuresInfo"
-      data-structures="<%= @lecture.structure_ids.to_json %>">
-</span>
+  <%= raw(@form) %>
+  <span id="lectureStructuresInfo"
+        data-structures="<%= @lecture.structure_ids.to_json %>">
+  </span>
+<% end %>

app/views/lectures/show_structures.html.erb

@@ -1,4 +1,8 @@
-<%= render partial: 'lectures/show/structures',
-           locals: { lecture: @lecture,
-           					 structures: @structures,
-                     properties: @properties } %>
+<% if @erdbeere_error %>
+  <%= t("erdbeere.error") %>
+<% else %>
+  <%= render partial: 'lectures/show/structures',
+             locals: { lecture: @lecture,
+             					structures: @structures,
+                       properties: @properties } %>
+<% end %>

config/initializers/erdbeere_connection.rb

@@ -0,0 +1,5 @@
+ERDBEERE_API_URL = ENV.fetch("ERDBEERE_API")
+
+ERDBEERE_CONNECTION = Faraday.new(url: ERDBEERE_API_URL) do |conn|
+  conn.adapter(Faraday.default_adapter)
+end

config/locales/de.yml

@@ -3451,6 +3451,8 @@ de:
     no_structures: >
       Zu dieser Vorlesung sind keine Strukturen aus der Beispieldatenbank
       assoziiert.
+    error: >
+      Es ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.
   basics:
     error: Fehler
     course: 'Modul'

config/locales/en.yml

@@ -3256,6 +3256,8 @@ en:
     search_examples: 'Search for Examples'
     no_structures: >
       There are no structures associated to this lecture.
+    error: >
+      An error has occurred. Please try again later.
   basics:
     error: Error
     course: 'Course'

docker/development/docker-compose.yml

@@ -100,8 +100,8 @@ services:
       URL_HOST: localhost
       URL_HOST_SHORT: localhost
       SECRET_KEY_BASE: testenvironment
-      ERDBEERE_SERVER: https://erdbeere.mathi.uni-heidelberg.de
-      ERDBEERE_API: https://erdbeere.mathi.uni-heidelberg.de/api/v1
+      ERDBEERE_SERVER: http://erdbeere:3005
+      ERDBEERE_API: http://erdbeere:3005/api/v1
       MUESLI_SERVER: https://muesli.mathi.uni-heidelberg.de
       PROJECT_EMAIL: project@localhost
       FEEDBACK_EMAIL: feedback@localhost
@@ -139,6 +139,8 @@ services:
       - solr
       - redis
       - mailcatcher
+    extra_hosts:
+      - "erdbeere:host-gateway"
     labels:
       de.uni-heidelberg.mathi.mampf.container-type: worker
 

lib/clients/erdbeere_client.rb

@@ -0,0 +1,15 @@
+module Clients
+  class ErdbeereClient
+    Response = Struct.new(:status, :body)
+
+    def self.get(path, params: nil, headers: {}, &block)
+      headers = headers.dup
+      headers["Host"] = "localhost" if Rails.env.docker_development?
+      ERDBEERE_CONNECTION.get(path, params, headers, &block)
+    rescue Faraday::Error => e
+      pp("---------------------------------")
+      Rails.logger.error("ErdbeereClient.get error: #{e.message}")
+      Response.new(500, { error: e.message }.to_json)
+    end
+  end
+end