From d5c08247238f3de354eaedc243cc036fa5c64875 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:55:48 +0100
Subject: [PATCH 01/38] EN-7825 add variables to user_message_broadcasts,
 welcome chat_message

---
 app/helpers/users_helper.rb                   |  4 -
 app/models/chat_message.rb                    | 18 ++++
 app/models/concerns/availabilable.rb          |  9 ++
 app/models/conversation_message_broadcast.rb  |  7 +-
 .../onboarding/chat_messages_service.rb       |  5 +-
 .../admin/moderation_areas/_form.html.erb     |  8 +-
 .../user_message_broadcasts/_form.html.erb    |  2 +-
 .../admin/users/_onboarding_fields.html.erb   |  2 +-
 .../_interpolation_specifications.html.erb    | 13 +++
 spec/models/chat_message_spec.rb              | 99 +++++++++++++++++++
 10 files changed, 147 insertions(+), 20 deletions(-)
 create mode 100644 app/views/common/_interpolation_specifications.html.erb

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 6f79f4f92..b02ef407d 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -1,8 +1,4 @@
 module UsersHelper
-  def day_name(day_number)
-    I18n.t("date.day_names")[day_number.to_i % 7]
-  end
-
   def users_for_select users
     users.map do |user|
       ["#{user.full_name} (#{user.email})", user.id]
diff --git a/app/models/chat_message.rb b/app/models/chat_message.rb
index cc3f9234d..468e8dbef 100644
--- a/app/models/chat_message.rb
+++ b/app/models/chat_message.rb
@@ -83,6 +83,24 @@ def path key
     end
   end
 
+  class << self
+    def interpolate message:, user:, author: nil
+      first_name = UserPresenter.format_first_name(user.first_name)
+
+      message
+        .gsub(/\{\{\s*first_name\s*\}\}/, first_name.to_s)
+        .gsub(/\{\{\s*email\s*\}\}/, user.email.to_s)
+        .gsub(/\{\{\s*phone\s*\}\}/, user.phone.to_s)
+        .gsub(/\{\{\s*city\s*\}\}/, user.city.to_s)
+        .gsub(/\{\{\s*uuid\s*\}\}/, user.uuid.to_s)
+        .gsub(/\{\{\s*default_neighborhood\s*\}\}/, user.default_neighborhood&.name.to_s)
+        .gsub(/\{\{\s*interests\s*\}\}/, user.interest_i18n.join(', '))
+        .gsub(/\{\{\s*involvements\s*\}\}/, user.involvement_i18n.join(', '))
+        .gsub(/\{\{\s*availability\s*\}\}/, user.availability_formatted.to_s)
+        .gsub(/\{\{\s*interlocutor\s*\}\}/, author&.first_name.to_s)
+    end
+  end
+
   def active?
     status.to_sym == :active
   end
diff --git a/app/models/concerns/availabilable.rb b/app/models/concerns/availabilable.rb
index 436d0636c..b6142cf16 100644
--- a/app/models/concerns/availabilable.rb
+++ b/app/models/concerns/availabilable.rb
@@ -40,4 +40,13 @@ def validate_availability_format
     end
   end
 
+  def availability_formatted
+    availability.map do |day_number, hours|
+      "#{Availabilable.day_name(day_number)} : #{hours.join(', ')}"
+    end.join("\n")
+  end
+
+  def self.day_name day_number
+    I18n.t("date.day_names")[day_number.to_i % 7]
+  end
 end
diff --git a/app/models/conversation_message_broadcast.rb b/app/models/conversation_message_broadcast.rb
index 46b6e7c85..eca88bdc1 100644
--- a/app/models/conversation_message_broadcast.rb
+++ b/app/models/conversation_message_broadcast.rb
@@ -17,12 +17,7 @@ def find_with_cast id
   end
 
   def content_for_user user
-    content
-      .gsub("{{first_name}}", user.first_name.to_s)
-      .gsub("{{email}}", user.email.to_s)
-      .gsub("{{phone}}", user.phone.to_s)
-      .gsub("{{city}}", user.city.to_s)
-      .gsub("{{uuid}}", user.uuid.to_s)
+    ChatMessage.interpolate(message: content, user: user)
   end
 
   def recipients
diff --git a/app/services/onboarding/chat_messages_service.rb b/app/services/onboarding/chat_messages_service.rb
index 5dc830e28..139b4a76f 100644
--- a/app/services/onboarding/chat_messages_service.rb
+++ b/app/services/onboarding/chat_messages_service.rb
@@ -38,11 +38,8 @@ def self.deliver_welcome_message
 
           next if messages.empty?
 
-          first_name = UserPresenter.format_first_name user.first_name
-
           messages.each do |message|
-            message = message.gsub(/\{\{\s*first_name\s*\}\}/, first_name)
-            message = message.gsub(/\{\{\s*interlocutor\s*\}\}/, author.first_name) if author.present?
+            message = ChatMessage.interpolate(message: message, user: user, author: author)
 
             builder = ChatServices::ChatMessageBuilder.new(
               user: author,
diff --git a/app/views/admin/moderation_areas/_form.html.erb b/app/views/admin/moderation_areas/_form.html.erb
index acefe9d79..6ed2ef7da 100644
--- a/app/views/admin/moderation_areas/_form.html.erb
+++ b/app/views/admin/moderation_areas/_form.html.erb
@@ -65,7 +65,7 @@
             pour le profil <%= t 'community.entourage.goals_compact.offer_help' %>
           <% end %>
           <%= f.text_area :welcome_message_1_offer_help, rows: 10, class: "form-control" %>
-          Utilisez <code>{{first_name}}</code> pour insérer le prénom du destinataire.
+          <%= render partial: 'common/interpolation_specifications' %>
         </div>
       </div>
 
@@ -76,7 +76,7 @@
             si <%= t 'community.entourage.goals_compact.ask_for_help' %>
           <% end %>
           <%= f.text_area :welcome_message_1_ask_for_help, rows: 10, class: "form-control" %>
-          Utilisez <code>{{first_name}}</code> pour insérer le prénom du destinataire.
+          <%= render partial: 'common/interpolation_specifications' %>
         </div>
       </div>
 
@@ -87,7 +87,7 @@
             pour le profil <%= t 'community.entourage.goals_compact.organization' %>
           <% end %>
           <%= f.text_area :welcome_message_1_organization, rows: 10, class: "form-control" %>
-          Utilisez <code>{{first_name}}</code> pour insérer le prénom du destinataire.
+          <%= render partial: 'common/interpolation_specifications' %>
         </div>
       </div>
 
@@ -98,7 +98,7 @@
             pour le profil <%= t 'community.entourage.goals_compact.goal_not_known' %>
           <% end %>
           <%= f.text_area :welcome_message_1_goal_not_known, rows: 10, class: "form-control" %>
-          Utilisez <code>{{first_name}}</code> pour insérer le prénom du destinataire.
+          <%= render partial: 'common/interpolation_specifications' %>
         </div>
       </div>
     </div>
diff --git a/app/views/admin/user_message_broadcasts/_form.html.erb b/app/views/admin/user_message_broadcasts/_form.html.erb
index 2b8c6cfc9..32884c863 100644
--- a/app/views/admin/user_message_broadcasts/_form.html.erb
+++ b/app/views/admin/user_message_broadcasts/_form.html.erb
@@ -137,8 +137,8 @@
 
   <div class="form-group">
     <%= f.label :content %>
-    <p>Vous pouvez utiliser les variables : {{first_name}}, {{email}}, {{phone}}, {{city}}, {{uuid}}</p>
     <%= f.text_area :content, class: "form-control", rows: 5, required: true %>
+    <p><%= render partial: 'common/interpolation_specifications' %></p>
   </div>
 
   <% if @user_message_broadcast.draft? %>
diff --git a/app/views/admin/users/_onboarding_fields.html.erb b/app/views/admin/users/_onboarding_fields.html.erb
index 6c7dbf682..ed93d21ea 100644
--- a/app/views/admin/users/_onboarding_fields.html.erb
+++ b/app/views/admin/users/_onboarding_fields.html.erb
@@ -5,7 +5,7 @@
     <ul>
       <% @user.availability.each do |day, slots| %>
         <li>
-          <strong><%= day_name(day) %>:</strong>
+          <strong><%= Availabilable.day_name(day) %>:</strong>
           <%= slots.join(', ') %>
         </li>
       <% end %>
diff --git a/app/views/common/_interpolation_specifications.html.erb b/app/views/common/_interpolation_specifications.html.erb
new file mode 100644
index 000000000..1c414a98e
--- /dev/null
+++ b/app/views/common/_interpolation_specifications.html.erb
@@ -0,0 +1,13 @@
+Les variables suivantes sont disponibles :
+<ul>
+  <li><code>{{first_name}}</code> : <i>prénom du destinataire</i></li>
+  <li><code>{{email}}</code> : <i>email du destinataire</i></li>
+  <li><code>{{phone}}</code> téléphone du destinataire</li>
+  <li><code>{{city}}</code> : <i>ville du destinataire</i></li>
+  <li><code>{{uuid}}</code> : <i>uuid du destinataire</i></li>
+  <li><code>{{default_neighborhood}}</code> : <i>nom du groupe de voisins par défaut du destinataire</i></li>
+  <li><code>{{interests}}</code> : <i>centres d'intérêt du destinataire</i></li>
+  <li><code>{{involvements}}</code> : <i>envies d'agir du destinataire</i></li>
+  <li><code>{{availability}}</code> : <i>disponibilités du destinataire</i></li>
+  <li><code>{{interlocutor}}</code> : <i>prénom du <b>modérateur</b> lié au destinataire</i></li>
+</ul>
diff --git a/spec/models/chat_message_spec.rb b/spec/models/chat_message_spec.rb
index 8e37f5955..61ae66ecb 100644
--- a/spec/models/chat_message_spec.rb
+++ b/spec/models/chat_message_spec.rb
@@ -20,6 +20,105 @@
     end
   end
 
+  describe '.interpolate' do
+    let(:user) { create(:public_user,
+      first_name: 'John',
+      email: 'john.doe@example.com',
+      phone: '+33612345678',
+      uuid: '123e4567-e89b-12d3-a456-426614174000',
+      interest_list: 'jeux, cuisine',
+      involvement_list: 'outings, resources',
+      availability: {
+        "1" => ["09:00-12:00", "14:00-18:00"],
+        "2" => ["10:00-12:00"]
+      },
+      address: address,
+      addresses: [address]
+    )}
+
+    let(:other_user) { create(:public_user) }
+    let(:author) { create(:public_user, first_name: 'Alice') }
+
+    let(:neighborhood) { create(:neighborhood, name: "Groupe de Paris") }
+    let(:address) { create :address, city: "Paris" }
+
+    before do
+      allow(user).to receive(:default_neighborhood).and_return(neighborhood)
+      allow(UserPresenter).to receive(:format_first_name).with('John').and_return('John')
+    end
+
+    it 'replaces placeholders in the message' do
+      message = <<~TEXT
+        Hello {{ first_name }},
+        Your email is {{ email }}, and your phone number is {{ phone }}.
+        You live in {{ city }} and your ID is {{ uuid }}.
+        Default neighborhood: {{ default_neighborhood }}.
+        Your interests: {{ interests }}.
+        Your involvements: {{ involvements }}.
+        Availability: {{ availability }}.
+        Interlocutor: {{ interlocutor }}.
+      TEXT
+
+      expected_message = <<~TEXT
+        Hello John,
+        Your email is john.doe@example.com, and your phone number is +33612345678.
+        You live in Paris and your ID is 123e4567-e89b-12d3-a456-426614174000.
+        Default neighborhood: Groupe de Paris.
+        Your interests: Jeux, Cuisine.
+        Your involvements: Participer à des événements de convivialité, Apprendre avec des contenus pédagogiques.
+        Availability: lundi : 09:00-12:00, 14:00-18:00
+        mardi : 10:00-12:00.
+        Interlocutor: Alice.
+      TEXT
+
+      result = ChatMessage.interpolate(message: message, user: user, author: author)
+      expect(result.strip).to eq(expected_message.strip)
+    end
+
+    it 'replaces placeholders in the message when user has little information' do
+      message = <<~TEXT
+        Hello {{ first_name }},
+        Your email is {{ email }}, and your phone number is {{ phone }}.
+        You live in {{ city }} and your ID is {{ uuid }}.
+        Default neighborhood: {{ default_neighborhood }}.
+        Your interests: {{ interests }}.
+        Your involvements: {{ involvements }}.
+        Availability: {{ availability }}.
+        Interlocutor: {{ interlocutor }}.
+      TEXT
+
+      expected_message = <<~TEXT
+        Hello John,
+        Your email is #{other_user.email}, and your phone number is #{other_user.phone}.
+        You live in  and your ID is #{other_user.uuid}.
+        Default neighborhood: .
+        Your interests: .
+        Your involvements: .
+        Availability: .
+        Interlocutor: Alice.
+      TEXT
+
+      result = ChatMessage.interpolate(message: message, user: other_user, author: author)
+      expect(result.strip).to eq(expected_message.strip)
+    end
+
+    it 'handles missing placeholders gracefully when author is nil' do
+      message = "Hello {{ first_name }}, your interlocutor is {{ interlocutor }}."
+      expected_message = "Hello John, your interlocutor is ."
+
+      result = ChatMessage.interpolate(message: message, user: user, author: nil)
+      expect(result).to eq(expected_message)
+    end
+
+    it 'handles missing placeholders in the message' do
+      message = "This message has no placeholders."
+      expected_message = "This message has no placeholders."
+
+      result = ChatMessage.interpolate(message: message, user: user)
+      expect(result).to eq(expected_message)
+    end
+  end
+
   describe "custom type" do
     let(:entourage) { create :entourage }
     let!(:group) { create :entourage, uuid_v2: "uuid-123" }

From d69dd66764a0f01778d9597ea47cc46445ef287a Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:22:11 +0100
Subject: [PATCH 02/38] EN-7825 sort lists to get expected rspec

---
 app/models/chat_message.rb       | 4 ++--
 spec/models/chat_message_spec.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/chat_message.rb b/app/models/chat_message.rb
index 468e8dbef..0a7a74e71 100644
--- a/app/models/chat_message.rb
+++ b/app/models/chat_message.rb
@@ -94,8 +94,8 @@ def interpolate message:, user:, author: nil
         .gsub(/\{\{\s*city\s*\}\}/, user.city.to_s)
         .gsub(/\{\{\s*uuid\s*\}\}/, user.uuid.to_s)
         .gsub(/\{\{\s*default_neighborhood\s*\}\}/, user.default_neighborhood&.name.to_s)
-        .gsub(/\{\{\s*interests\s*\}\}/, user.interest_i18n.join(', '))
-        .gsub(/\{\{\s*involvements\s*\}\}/, user.involvement_i18n.join(', '))
+        .gsub(/\{\{\s*interests\s*\}\}/, user.interest_i18n.sort.join(', '))
+        .gsub(/\{\{\s*involvements\s*\}\}/, user.involvement_i18n.sort.join(', '))
         .gsub(/\{\{\s*availability\s*\}\}/, user.availability_formatted.to_s)
         .gsub(/\{\{\s*interlocutor\s*\}\}/, author&.first_name.to_s)
     end
diff --git a/spec/models/chat_message_spec.rb b/spec/models/chat_message_spec.rb
index 61ae66ecb..53ef5452e 100644
--- a/spec/models/chat_message_spec.rb
+++ b/spec/models/chat_message_spec.rb
@@ -64,8 +64,8 @@
         Your email is john.doe@example.com, and your phone number is +33612345678.
         You live in Paris and your ID is 123e4567-e89b-12d3-a456-426614174000.
         Default neighborhood: Groupe de Paris.
-        Your interests: Jeux, Cuisine.
-        Your involvements: Participer à des événements de convivialité, Apprendre avec des contenus pédagogiques.
+        Your interests: Cuisine, Jeux.
+        Your involvements: Apprendre avec des contenus pédagogiques, Participer à des événements de convivialité.
         Availability: lundi : 09:00-12:00, 14:00-18:00
         mardi : 10:00-12:00.
         Interlocutor: Alice.

From ec2e559180e4bdea82e568c4e3b93ecadae288b5 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Tue, 10 Dec 2024 14:30:23 +0100
Subject: [PATCH 03/38] EN-7825 fix interlocutor

---
 app/models/chat_message.rb       |  4 ++
 spec/models/chat_message_spec.rb | 74 ++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/app/models/chat_message.rb b/app/models/chat_message.rb
index 0a7a74e71..39dcbd2ad 100644
--- a/app/models/chat_message.rb
+++ b/app/models/chat_message.rb
@@ -87,6 +87,10 @@ class << self
     def interpolate message:, user:, author: nil
       first_name = UserPresenter.format_first_name(user.first_name)
 
+      if message.match?(/\{\{\s*interlocutor\s*\}\}/)
+        author ||= ModerationServices.moderation_area_for_user_with_default(user)&.interlocutor_for_user(user)
+      end
+
       message
         .gsub(/\{\{\s*first_name\s*\}\}/, first_name.to_s)
         .gsub(/\{\{\s*email\s*\}\}/, user.email.to_s)
diff --git a/spec/models/chat_message_spec.rb b/spec/models/chat_message_spec.rb
index 53ef5452e..3f9ae7c5d 100644
--- a/spec/models/chat_message_spec.rb
+++ b/spec/models/chat_message_spec.rb
@@ -106,6 +106,10 @@
       message = "Hello {{ first_name }}, your interlocutor is {{ interlocutor }}."
       expected_message = "Hello John, your interlocutor is ."
 
+      allow(ModerationServices).to receive(:moderation_area_for_user_with_default)
+        .with(user)
+        .and_return(double(interlocutor_for_user: nil))
+
       result = ChatMessage.interpolate(message: message, user: user, author: nil)
       expect(result).to eq(expected_message)
     end
@@ -117,6 +121,76 @@
       result = ChatMessage.interpolate(message: message, user: user)
       expect(result).to eq(expected_message)
     end
+
+    context 'when the message includes {{interlocutor}}' do
+      it 'handles a message with multiple placeholders including {{interlocutor}} with no moderation area' do
+        allow(ModerationServices).to receive(:moderation_area_for_user_with_default)
+          .with(user)
+          .and_return(nil)
+
+        message = "Hello {{ first_name }}, your interlocutor is {{ interlocutor }}."
+        expected_message = "Hello John, your interlocutor is ."
+
+        result = ChatMessage.interpolate(message: message, user: user, author: nil)
+        expect(result).to eq(expected_message)
+      end
+
+      it 'handles a message with multiple placeholders including {{interlocutor}} with no moderator' do
+        allow(ModerationServices).to receive(:moderation_area_for_user_with_default)
+          .with(user)
+          .and_return(double(interlocutor_for_user: nil))
+
+        message = "Hello {{ first_name }}, your interlocutor is {{ interlocutor }}."
+        expected_message = "Hello John, your interlocutor is ."
+
+        result = ChatMessage.interpolate(message: message, user: user, author: nil)
+        expect(result).to eq(expected_message)
+      end
+
+      it 'replaces {{interlocutor}} when an author is dynamically determined' do
+        allow(ModerationServices).to receive(:moderation_area_for_user_with_default)
+          .with(user)
+          .and_return(double(interlocutor_for_user: author))
+
+        message = "Your interlocutor is {{ interlocutor }}."
+        expected_message = "Your interlocutor is Alice."
+
+        result = ChatMessage.interpolate(message: message, user: user, author: nil)
+        expect(result).to eq(expected_message)
+      end
+
+      it 'replaces {{interlocutor}} when author is provided manually' do
+        message = "Your interlocutor is {{ interlocutor }}."
+        expected_message = "Your interlocutor is Alice."
+
+        result = ChatMessage.interpolate(message: message, user: user, author: author)
+        expect(result).to eq(expected_message)
+      end
+
+      it 'leaves {{interlocutor}} blank when no author and no default interlocutor are available' do
+        allow(ModerationServices).to receive(:moderation_area_for_user_with_default)
+          .with(user)
+          .and_return(double(interlocutor_for_user: nil))
+
+        message = "Your interlocutor is {{ interlocutor }}."
+        expected_message = "Your interlocutor is ."
+
+        result = ChatMessage.interpolate(message: message, user: user, author: nil)
+        expect(result).to eq(expected_message)
+      end
+
+      it 'handles a message with multiple placeholders including {{interlocutor}}' do
+        allow(ModerationServices).to receive(:moderation_area_for_user_with_default)
+          .with(user)
+          .and_return(double(interlocutor_for_user: author))
+
+        message = "Hello {{ first_name }}, your interlocutor is {{ interlocutor }}."
+        expected_message = "Hello John, your interlocutor is Alice."
+
+        result = ChatMessage.interpolate(message: message, user: user, author: nil)
+        expect(result).to eq(expected_message)
+      end
+    end
   end
 
   describe "custom type" do

From a9636cbe152a1571ec69c3794f765a406a9266f8 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Wed, 4 Sep 2024 13:50:45 +0200
Subject: [PATCH 04/38] EN-7354 skeleton to compute matching using openai
 assistants

---
 Gemfile                                       |   1 +
 Gemfile.lock                                  | 247 ++++++++++--------
 Procfile                                      |   2 +-
 app/jobs/openai_assistant_job.rb              |  47 ++++
 app/models/action.rb                          |   3 +
 app/models/concerns/matchable.rb              |  41 +++
 app/models/contribution.rb                    |   6 +-
 app/models/entourage.rb                       |   2 +
 app/models/matching.rb                        |   4 +
 app/models/openai_assistant.rb                |  11 +
 app/models/solicitation.rb                    |   6 +-
 app/services/entourage_services/matcher.rb    | 169 ++++++++++++
 ...20240904090300_create_openai_assistants.rb |  20 ++
 db/migrate/20240904090301_create_matchings.rb |  18 ++
 spec/rails_helper.rb                          |   1 +
 .../entourage_services/matcher_spec.rb        |  39 +++
 16 files changed, 498 insertions(+), 119 deletions(-)
 create mode 100644 app/jobs/openai_assistant_job.rb
 create mode 100644 app/models/concerns/matchable.rb
 create mode 100644 app/models/matching.rb
 create mode 100644 app/models/openai_assistant.rb
 create mode 100644 app/services/entourage_services/matcher.rb
 create mode 100644 db/migrate/20240904090300_create_openai_assistants.rb
 create mode 100644 db/migrate/20240904090301_create_matchings.rb
 create mode 100644 spec/services/entourage_services/matcher_spec.rb

diff --git a/Gemfile b/Gemfile
index 93939c82c..6abce919b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,6 +30,7 @@ gem 'simplify_rb',                    '~> 0'
 gem 'lograge'
 gem 'logstash-event'
 gem 'aws-sdk-s3',                     '~> 1'
+gem 'ruby-openai'
 gem 'faker'
 gem 'activerecord-postgis-adapter',   '~> 6.0'
 gem 'slack-notifier'
diff --git a/Gemfile.lock b/Gemfile.lock
index 354621683..94e99c673 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,40 +25,40 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actioncable (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionmailbox (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionmailer (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      actionview (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.8)
-      actionview (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionpack (6.1.7.10)
+      actionview (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actiontext (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionview (6.1.7.10)
+      activesupport (= 6.1.7.10)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -68,25 +68,25 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activejob (6.1.7.10)
+      activesupport (= 6.1.7.10)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activerecord (6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activemodel (6.1.7.10)
+      activesupport (= 6.1.7.10)
+    activerecord (6.1.7.10)
+      activemodel (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
     activerecord-postgis-adapter (6.0.1)
       activerecord (~> 6.0)
       rgeo-activerecord (~> 6.0)
-    activestorage (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activestorage (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.8)
+    activesupport (6.1.7.10)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -110,23 +110,23 @@ GEM
       encryptor (~> 3.0.0)
     attr_extras (7.1.0)
     aws-eventstream (1.3.0)
-    aws-partitions (1.971.0)
-    aws-sdk-core (3.203.0)
+    aws-partitions (1.1001.0)
+    aws-sdk-core (3.211.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
+      aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.89.0)
-      aws-sdk-core (~> 3, >= 3.203.0)
+    aws-sdk-kms (1.95.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.160.0)
-      aws-sdk-core (~> 3, >= 3.203.0)
+    aws-sdk-s3 (1.169.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-sns (1.83.0)
-      aws-sdk-core (~> 3, >= 3.203.0)
+    aws-sdk-sns (1.89.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.9.1)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     barnes (0.0.9)
       multi_json (~> 1)
@@ -141,7 +141,7 @@ GEM
       uniform_notifier (~> 1.11)
     case_transform (0.2)
       activesupport
-    chartkick (5.1.0)
+    chartkick (5.1.2)
     chronic (0.10.2)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
@@ -159,7 +159,7 @@ GEM
     csv (3.3.0)
     datadog-ci (0.8.3)
       msgpack
-    date (3.3.4)
+    date (3.4.0)
     ddtrace (1.23.3)
       datadog-ci (~> 0.8.1)
       debase-ruby_core_source (= 3.3.1)
@@ -168,19 +168,20 @@ GEM
       msgpack
     debase-ruby_core_source (3.3.1)
     diff-lcs (1.5.1)
-    dotenv (3.1.2)
-    dotenv-rails (3.1.2)
-      dotenv (= 3.1.2)
+    dotenv (3.1.4)
+    dotenv-rails (3.1.4)
+      dotenv (= 3.1.4)
       railties (>= 6.1)
     encryptor (3.0.0)
     erubi (1.13.0)
-    execjs (2.9.1)
+    event_stream_parser (1.0.0)
+    execjs (2.10.0)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    faker (3.4.2)
+    faker (3.5.1)
       i18n (>= 1.8.11, < 2)
     fakeredis (0.9.2)
       redis (~> 4.8)
@@ -192,18 +193,18 @@ GEM
       multipart-post (~> 2)
     faraday-net_http (3.1.1)
       net-http
-    faraday-net_http_persistent (2.1.0)
+    faraday-net_http_persistent (2.3.0)
       faraday (~> 2.5)
-      net-http-persistent (~> 4.0)
+      net-http-persistent (>= 4.0.4, < 5)
     ffi (1.16.3)
     geocoder (1.8.3)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-cloud-env (2.2.0)
+    google-cloud-env (2.2.1)
       faraday (>= 1.0, < 3.a)
-    googleauth (1.11.0)
+    googleauth (1.11.2)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
@@ -222,10 +223,11 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    icalendar (2.10.2)
+    icalendar (2.10.3)
       ice_cube (~> 0.16)
+      ostruct
     ice_cube (0.17.0)
     jmespath (1.6.2)
     jquery-rails (4.6.0)
@@ -234,11 +236,11 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    json (2.7.2)
+    json (2.7.6)
     json-schema (2.8.1)
       addressable (>= 2.4)
     jsonapi-renderer (0.2.2)
-    jwt (2.8.2)
+    jwt (2.9.3)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -254,15 +256,25 @@ GEM
     kaminari-core (1.2.2)
     language_server-protocol (3.17.0.3)
     libdatadog (7.0.0.1.0)
+    libdatadog (7.0.0.1.0-aarch64-linux)
+    libdatadog (7.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-aarch64-linux)
+      ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-arm64-darwin)
+      ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-darwin)
+      ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
     logstash-event (1.2.02)
-    loofah (2.22.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -279,22 +291,21 @@ GEM
     method_source (1.1.0)
     mini_magick (5.0.1)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
     minitest (5.25.1)
     momentjs-rails (2.29.4.1)
       railties (>= 3.1)
-    msgpack (1.7.2)
+    msgpack (1.7.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.4.1)
     mustache (1.1.1)
     net-http (0.4.1)
       uri
-    net-http-persistent (4.0.2)
+    net-http-persistent (4.0.4)
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.16)
+    net-imap (0.5.0)
       date
       net-protocol
     net-pop (0.1.2)
@@ -309,46 +320,56 @@ GEM
       zeitwerk (~> 2, >= 2.2)
     nexmo-jwt (0.1.2)
       jwt (~> 2)
-    nio4r (2.7.3)
-    nokogiri (1.16.7)
-      mini_portile2 (~> 2.8.2)
+    nio4r (2.7.4)
+    nokogiri (1.16.7-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     openssl (3.2.0)
     optimist (3.1.0)
     os (1.1.4)
+    ostruct (0.6.0)
     parallel (1.26.3)
-    parser (3.3.5.0)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
-    pg (1.5.7)
-    phonelib (0.9.1)
+    pg (1.5.9)
+    phonelib (0.9.3)
     polylines (0.4.0)
     public_suffix (6.0.1)
-    puma (6.4.2)
+    puma (6.4.3)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.9)
+    rack (2.2.10)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.7.0)
-    rails (6.1.7.8)
-      actioncable (= 6.1.7.8)
-      actionmailbox (= 6.1.7.8)
-      actionmailer (= 6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actiontext (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    rails (6.1.7.10)
+      actioncable (= 6.1.7.10)
+      actionmailbox (= 6.1.7.10)
+      actionmailer (= 6.1.7.10)
+      actionpack (= 6.1.7.10)
+      actiontext (= 6.1.7.10)
+      actionview (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activemodel (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.8)
+      railties (= 6.1.7.10)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -368,9 +389,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    railties (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -391,7 +412,7 @@ GEM
       faraday-net_http (< 4.0.0)
       hashie (>= 1.2.0, < 6.0)
       jwt (>= 1.5.6)
-    rexml (3.3.7)
+    rexml (3.3.9)
     rgeo (3.0.1)
     rgeo-activerecord (6.2.2)
       activerecord (>= 5.0)
@@ -400,12 +421,12 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-rails (6.1.5)
@@ -421,7 +442,7 @@ GEM
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)
       rspec (~> 3.0)
-    rubocop (1.66.1)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -431,15 +452,19 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.34.0)
       parser (>= 3.3.1.0)
-    rubocop-rails (2.26.0)
+    rubocop-rails (2.27.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.4)
+    rubocop-rspec (3.2.0)
       rubocop (~> 1.61)
+    ruby-openai (7.3.1)
+      event_stream_parser (>= 0.3.0, < 2.0.0)
+      faraday (>= 1)
+      faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
     ruby-stemmer (3.0.0)
     safety_mailer (0.0.10)
@@ -470,7 +495,7 @@ GEM
       multi_json (~> 1.10)
     simplify_rb (0.4.0)
     slack-notifier (2.4.0)
-    sorbet-runtime (0.5.11557)
+    sorbet-runtime (0.5.11637)
     spring (2.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -484,32 +509,32 @@ GEM
     statsd-ruby (1.5.0)
     store_attribute (1.3.1)
       activerecord (>= 6.1)
-    super_diff (0.12.1)
+    super_diff (0.13.0)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
-    terser (1.2.3)
+    terser (1.2.4)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     tilt (2.4.0)
     timecop (0.9.10)
-    timeout (0.4.1)
-    tinymce-rails (7.3.0)
+    timeout (0.4.2)
+    tinymce-rails (7.5.0)
       railties (>= 3.1.1)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uglifier (4.2.0)
+    uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     uniform_notifier (1.16.0)
     uri (0.13.1)
     web-push (3.0.1)
       jwt (~> 2.0)
       openssl (~> 3.0)
-    webmock (3.23.1)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -522,7 +547,12 @@ GEM
     zeitwerk (2.6.18)
 
 PLATFORMS
-  ruby
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
 
 DEPENDENCIES
   active_model_serializers (~> 0.10)
@@ -578,6 +608,7 @@ DEPENDENCIES
   rspec_api_documentation
   rubocop-rails
   rubocop-rspec
+  ruby-openai
   ruby-stemmer
   safety_mailer
   sass-rails
diff --git a/Procfile b/Procfile
index 8685cae06..aee929ede 100644
--- a/Procfile
+++ b/Procfile
@@ -1,4 +1,4 @@
 web: bundle exec puma -C config/puma.rb
 worker_1: bundle exec sidekiq -c ${SIDEKIQ_CONCURRENCY:-2} -q sms -q salesforce -q translation
-worker_2: bundle exec sidekiq -c ${SIDEKIQ_CONCURRENCY:-10} -q mailers -q default -q broadcast -q denorm
+worker_2: bundle exec sidekiq -c ${SIDEKIQ_CONCURRENCY:-10} -q mailers -q default -q openai_assistants -q broadcast -q denorm
 release: ACTIVERECORD_STATEMENT_TIMEOUT=90s bundle exec rake db:migrate
diff --git a/app/jobs/openai_assistant_job.rb b/app/jobs/openai_assistant_job.rb
new file mode 100644
index 000000000..e875b1999
--- /dev/null
+++ b/app/jobs/openai_assistant_job.rb
@@ -0,0 +1,47 @@
+require 'json'
+
+class OpenaiAssistantJob
+  include Sidekiq::Worker
+
+  sidekiq_options :retry => false, queue: :openai_assistants
+
+  def perform openai_assistant_id
+    openai_assistant = OpenaiAssistant.find(openai_assistant_id)
+
+    return unless instance = openai_assistant.instance
+
+    EntourageServices::Matcher.new(instance: instance).find_best_matches do |on|
+      on.success do |matches|
+        openai_assistant.update_columns(
+          openai_assistant_id: matches['assistant_id'],
+          openai_thread_id: matches['thread_id'],
+          openai_run_id: matches['run_id'],
+          openai_message_id: matches['message_id'],
+          status: matches['status'],
+          run_ends_at: Time.current,
+          updated_at: Time.current
+        )
+
+        matches['matchings'].each_with_index do |matching, index|
+          next unless parse_matching = EntourageServices::Matcher.parse_matching(matching)
+
+          instance.matchings.build(match: parse_matching, score: matching['score'], position: index)
+        end
+
+        instance.save(validate: false)
+      end
+
+      on.failure do |error|
+        openai_assistant.update_columns(
+          status: :error,
+          run_ends_at: Time.current,
+          updated_at: Time.current
+        )
+      end
+    end
+  end
+
+  def self.perform_later openai_assistant_id
+    OpenaiAssistantJob.perform_async(openai_assistant_id)
+  end
+end
diff --git a/app/models/action.rb b/app/models/action.rb
index 02f0b30c8..73f37d5fc 100644
--- a/app/models/action.rb
+++ b/app/models/action.rb
@@ -1,4 +1,7 @@
 class Action < Entourage
+  include Actionable
+  include Matchable
+  include Recommandable
   include Sectionable
 
   default_scope { where(group_type: :action, entourage_type: [:ask_for_help, :contribution]).order(created_at: :desc) }
diff --git a/app/models/concerns/matchable.rb b/app/models/concerns/matchable.rb
new file mode 100644
index 000000000..eba0dbe60
--- /dev/null
+++ b/app/models/concerns/matchable.rb
@@ -0,0 +1,41 @@
+module Matchable
+  extend ActiveSupport::Concern
+
+  included do
+    after_save :match_on_save, :if => :matchable_field_changed?
+
+    has_one :openai_assistant, as: :instance
+    has_many :matchings, as: :instance
+    has_many :matches, through: :matchings, source: :match
+  end
+
+  def matchable_field_changed?
+    previous_changes.slice(:title, :name, :description).present?
+  end
+
+  def match
+    @match ||= MatchStruct.new(instance: self)
+  end
+
+  def match_on_save
+    match.on_save
+  end
+
+  MatchStruct = Struct.new(:instance) do
+    def initialize instance: nil
+      @instance = instance
+    end
+
+    def on_save
+      ensure_openai_assistant_exists!
+    end
+
+    def ensure_openai_assistant_exists!
+      return if @instance.openai_assistant && @instance.openai_assistant.persisted?
+
+      openai_assistant = (@instance.openai_assistant || @instance.build_openai_assistant)
+      openai_assistant.instance_type = @instance.class.name # forces "Action" rather than "Entourage"
+      openai_assistant.save!
+    end
+  end
+end
diff --git a/app/models/contribution.rb b/app/models/contribution.rb
index c1be4a9a9..85bdd364f 100644
--- a/app/models/contribution.rb
+++ b/app/models/contribution.rb
@@ -1,8 +1,4 @@
-class Contribution < Entourage
-  include Actionable
-  include Sectionable
-  include Recommandable
-
+class Contribution < Action
   CONTENT_TYPES = %w(image/jpeg)
   BUCKET_PREFIX = "contributions"
 
diff --git a/app/models/entourage.rb b/app/models/entourage.rb
index a9ca040f4..fcde0f79e 100644
--- a/app/models/entourage.rb
+++ b/app/models/entourage.rb
@@ -143,6 +143,8 @@ class Entourage < ApplicationRecord
 
   after_create :check_moderation
 
+  alias_attribute :name, :title
+
   def create_from_join_requests!
     ApplicationRecord.connection.transaction do
       participations = self.join_requests.to_a
diff --git a/app/models/matching.rb b/app/models/matching.rb
new file mode 100644
index 000000000..e6a7c4eae
--- /dev/null
+++ b/app/models/matching.rb
@@ -0,0 +1,4 @@
+class Matching < ApplicationRecord
+  belongs_to :instance, polymorphic: true
+  belongs_to :match, polymorphic: true
+end
diff --git a/app/models/openai_assistant.rb b/app/models/openai_assistant.rb
new file mode 100644
index 000000000..93aba59bb
--- /dev/null
+++ b/app/models/openai_assistant.rb
@@ -0,0 +1,11 @@
+class OpenaiAssistant < ApplicationRecord
+  belongs_to :instance, polymorphic: true
+
+  after_commit :run, on: :create
+
+  attr_accessor :forced_matching
+
+  def run
+    OpenaiAssistantJob.perform_later(id)
+  end
+end
diff --git a/app/models/solicitation.rb b/app/models/solicitation.rb
index f58edb496..52f71b96a 100644
--- a/app/models/solicitation.rb
+++ b/app/models/solicitation.rb
@@ -1,8 +1,4 @@
-class Solicitation < Entourage
-  include Actionable
-  include Sectionable
-  include Recommandable
-
+class Solicitation < Action
   default_scope {
     where(group_type: :action, entourage_type: :ask_for_help)
     .order(created_at: :desc)
diff --git a/app/services/entourage_services/matcher.rb b/app/services/entourage_services/matcher.rb
new file mode 100644
index 000000000..05e13ec1f
--- /dev/null
+++ b/app/services/entourage_services/matcher.rb
@@ -0,0 +1,169 @@
+module EntourageServices
+  class Matcher
+    PER = 25
+
+    attr_reader :callback, :instance, :user
+
+    class MatcherCallback < Callback
+    end
+
+    def initialize instance:
+      @callback = MatcherCallback.new
+      @instance = instance
+      @user = instance.user
+    end
+
+    def find_best_matches
+      yield callback if block_given?
+
+      matches = Client.new.find(instance: instance, contents: find_close_to_instance)
+
+      return callback.on_failure.try(:call, "No matches found") unless matches["success"]
+
+      callback.on_success.try(:call, matches)
+    rescue => e
+      callback.on_failure.try(:call, e.message)
+    end
+
+    def find_close_to_instance
+      latitude = instance.latitude
+      longitude = instance.longitude
+
+      {
+        contributions: ActiveModel::Serializer::CollectionSerializer.new(
+          get_contributions,
+          serializer: ::V1::Matchings::ActionSerializer,
+          scope: { latitude: latitude, longitude: longitude }
+        ),
+        solicitations: ActiveModel::Serializer::CollectionSerializer.new(
+          get_solicitations,
+          serializer: ::V1::Matchings::ActionSerializer,
+          scope: { latitude: latitude, longitude: longitude }
+        ),
+        outings: ActiveModel::Serializer::CollectionSerializer.new(
+          get_outings,
+          serializer: ::V1::Matchings::OutingSerializer,
+          scope: { latitude: latitude, longitude: longitude }
+        ),
+        resources: ActiveModel::Serializer::CollectionSerializer.new(
+          get_resources,
+          serializer: ::V1::Matchings::ResourceSerializer
+        ),
+        pois: ActiveModel::Serializer::CollectionSerializer.new(
+          get_pois,
+          serializer: ::V1::Matchings::PoiSerializer,
+          scope: { latitude: latitude, longitude: longitude }
+        )
+      }
+    end
+
+    def get_contributions
+      ContributionServices::Finder.new(user, Hash.new).find_all.limit(PER)
+    end
+
+    def get_solicitations
+      SolicitationServices::Finder.new(user, Hash.new).find_all.limit(PER)
+    end
+
+    def get_outings
+      OutingsServices::Finder.new(user, Hash.new).find_all.limit(PER)
+    end
+
+    def get_resources
+      Resource.where(status: :active)
+    end
+
+    def get_pois
+      Poi.validated.around(instance.latitude, instance.longitude, user.travel_distance).limit(PER)
+    end
+
+    def self.parse_matching matching
+      return unless matching.is_a?(Hash)
+      return unless matching.key?("id")
+      return unless matching.key?("type")
+
+      klass = matching["type"].classify.constantize
+
+      return klass.find_by_id_or_uuid(matching["id"]) if klass.respond_to?(:find_by_id_or_uuid)
+
+      klass.find_by_id(matching["id"])
+    end
+  end
+
+  class Client
+    attr_reader :client, :assistant_id
+
+    def initialize
+      @client = OpenAI::Client.new(access_token: ENV['OPENAI_API_KEY'])
+      @assistant_id = ENV['OPENAI_API_ASSISTANT_ID']
+    end
+
+    def find instance:, contents: []
+      # create new thread
+      thread = client.threads.create
+
+      # create instance message
+      message = client.messages.create(thread_id: thread['id'], parameters: {
+        role: "assistant",
+        content: {
+          instance: {
+            name: instance.name,
+            description: instance.description,
+            uuid: instance.uuid_v2
+          },
+          contents: contents
+        }.to_json
+      })
+
+      # run the thread
+      run = client.runs.create(thread_id: thread['id'], parameters: {
+        assistant_id: assistant_id,
+        max_prompt_tokens: 1024,
+        max_completion_tokens: 256
+      })
+
+      # wait for completion
+      status_loop(thread['id'], run['id'])
+
+      # find the message
+      return { success: false } unless result = find_run_message(thread['id'], run['id'])
+      return { success: false } unless result['success']
+
+      result.merge({
+        "assistant_id" => assistant_id,
+        "thread_id" => thread['id'],
+        "run_id" => run['id'],
+      })
+    end
+
+    def status_loop thread_id, run_id
+      while true do
+        response = client.runs.retrieve(id: run_id, thread_id: thread_id)
+        status = response['status']
+
+        break if ['completed'].include?(status) # success
+        break if ['cancelled', 'failed', 'expired'].include?(status) # error
+        break if ['incomplete'].include?(status) # ???
+
+        sleep 1 if ['queued', 'in_progress', 'cancelling'].include?(status)
+      end
+    end
+
+    def find_run_message thread_id, run_id
+      run_steps = client.run_steps.list(thread_id: thread_id, run_id: run_id, parameters: { order: 'asc' })
+
+      new_message_ids = run_steps['data'].filter_map { |step|
+        if step['type'] == 'message_creation'
+          step.dig('step_details', "message_creation", "message_id")
+        end
+      }
+
+      return unless new_message_ids.any?
+      return unless message = client.messages.retrieve(id: new_message_ids.first, thread_id: thread_id)
+
+      JSON.parse(message['content'].first['text']['value']).merge({
+        "message_id" => new_message_ids.first
+      })
+    end
+  end
+end
diff --git a/db/migrate/20240904090300_create_openai_assistants.rb b/db/migrate/20240904090300_create_openai_assistants.rb
new file mode 100644
index 000000000..d7ca160b7
--- /dev/null
+++ b/db/migrate/20240904090300_create_openai_assistants.rb
@@ -0,0 +1,20 @@
+class CreateOpenaiAssistants < ActiveRecord::Migration[6.1]
+  def change
+    create_table :openai_assistants do |t|
+      t.string :instance_type, null: false
+      t.integer :instance_id, null: false
+
+      t.string :openai_assistant_id
+      t.string :openai_thread_id
+      t.string :openai_run_id
+      t.string :openai_message_id
+      t.string :status
+      t.timestamp :run_starts_at
+      t.timestamp :run_ends_at
+
+      t.timestamps null: false
+
+      t.index [:instance_type, :instance_id]
+    end
+  end
+end
diff --git a/db/migrate/20240904090301_create_matchings.rb b/db/migrate/20240904090301_create_matchings.rb
new file mode 100644
index 000000000..06402d31c
--- /dev/null
+++ b/db/migrate/20240904090301_create_matchings.rb
@@ -0,0 +1,18 @@
+class CreateMatchings < ActiveRecord::Migration[6.1]
+  def change
+    create_table :matchings do |t|
+      t.string :instance_type, null: false
+      t.integer :instance_id, null: false
+
+      t.string :match_type, null: false
+      t.integer :match_id, null: false
+
+      t.float :score
+      t.integer :position
+
+      t.timestamps null: false
+
+      t.index [:instance_type, :instance_id]
+    end
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 95bbde58b..c9024fff4 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -19,6 +19,7 @@
     ActionMailer::Base.deliveries.clear
 
     stub_request(:any, /.*api.mailjet.com.*/).to_return(status: 200, body: { id: 1 }.to_json, headers: {})
+    stub_request(:any, /.*api.openai.*/).to_return(status: 200, body: "{}", headers: {})
 
     # deactivate slack_trace notifications
     SlackServices::StackTrace.any_instance.stub(:notify).and_return(nil)
diff --git a/spec/services/entourage_services/matcher_spec.rb b/spec/services/entourage_services/matcher_spec.rb
new file mode 100644
index 000000000..10aa25afa
--- /dev/null
+++ b/spec/services/entourage_services/matcher_spec.rb
@@ -0,0 +1,39 @@
+require 'rails_helper'
+
+RSpec.describe EntourageServices::Matcher do
+  describe 'parse_matching' do
+    let(:valid_json) do
+      { "score" => 0.95, "type" => "action", "id" => "abc_uuid_v2" }
+    end
+
+    let(:invalid_json) { nil }
+
+    it 'returns an empty array when json is nil' do
+      expect(described_class.parse_matching(invalid_json)).to be_nil
+    end
+
+    it 'returns an empty array when json does not contain keys' do
+      json_without_success = { "foo" => [] }
+      expect(described_class.parse_matching(json_without_success)).to be_nil
+    end
+
+    it 'returns an empty array when json does not contain id key' do
+      json_without_matchings = { "type" => "action" }
+      expect(described_class.parse_matching(json_without_matchings)).to be_nil
+    end
+
+    it 'returns an empty array when json does not contain type key' do
+      json_without_matchings = { "id" => "abc_uuid_v2" }
+      expect(described_class.parse_matching(json_without_matchings)).to be_nil
+    end
+
+    it 'returns a list of matched objects when json is valid' do
+      solicitation_double = double('Solicitation')
+      
+      expect(Action).to receive(:find_by_id_or_uuid).with('abc_uuid_v2').and_return(solicitation_double)
+
+      result = described_class.parse_matching(valid_json)
+      expect(result).to eq(solicitation_double)
+    end
+  end
+end

From e14a3ccb5d725ff72c71dbeac89b9ca5f24e7f33 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Wed, 4 Sep 2024 15:09:28 +0200
Subject: [PATCH 05/38] EN-7354 send a notification on matching with position=0

---
 app/models/notification_permission.rb         | 12 ++++++++--
 .../push_notification_trigger_observer.rb     |  2 +-
 app/services/push_notification_trigger.rb     | 24 ++++++++++++++++++-
 config/locales/entourage.fr.yml               |  2 ++
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/app/models/notification_permission.rb b/app/models/notification_permission.rb
index f6072710b..d219d03b7 100644
--- a/app/models/notification_permission.rb
+++ b/app/models/notification_permission.rb
@@ -1,6 +1,6 @@
 class NotificationPermission < ApplicationRecord
-  INAPP_INSTANCES = %{neighborhood outing contribution solicitation user}
-  PUSH_INSTANCES = %{neighborhood outing contribution solicitation conversation user}
+  INAPP_INSTANCES = %{neighborhood outing contribution solicitation user resource poi}
+  PUSH_INSTANCES = %{neighborhood outing contribution solicitation conversation user resource poi}
 
   belongs_to :user
   validates_presence_of :user
@@ -67,6 +67,14 @@ def action instance_id = nil
     permissions["action"]
   end
 
+  def resource instance_id = nil
+    true
+  end
+
+  def poi instance_id = nil
+    true
+  end
+
   # setters
   def neighborhood= accepted
     permissions["neighborhood"] = ActiveModel::Type::Boolean.new.cast(accepted)
diff --git a/app/models/push_notification_trigger_observer.rb b/app/models/push_notification_trigger_observer.rb
index 010c12fdd..a664cb721 100644
--- a/app/models/push_notification_trigger_observer.rb
+++ b/app/models/push_notification_trigger_observer.rb
@@ -1,5 +1,5 @@
 class PushNotificationTriggerObserver < ActiveRecord::Observer
-  observe :translation, :entourage, :entourage_moderation, :join_request, :neighborhoods_entourage, :survey_response, :user_reaction
+  observe :translation, :entourage, :entourage_moderation, :join_request, :neighborhoods_entourage, :survey_response, :user_reaction, :matching
 
   def after_save record
     record.instance_variable_set(:@record_changes, record.saved_changes)
diff --git a/app/services/push_notification_trigger.rb b/app/services/push_notification_trigger.rb
index 99f539055..fbe694d6a 100644
--- a/app/services/push_notification_trigger.rb
+++ b/app/services/push_notification_trigger.rb
@@ -5,6 +5,7 @@ class PushNotificationTrigger
   #  :chat_message
   #  :join_request
   #  :neighborhoods_entourage
+  #  :matching
 
   I18nStruct = Struct.new(:i18n, :i18n_args, :instance, :field, :date, :text) do
     def initialize(i18n: nil, i18n_args: [], instance: nil, field: nil, date: nil, text: nil)
@@ -25,7 +26,7 @@ def to lang
       return @i18ns[lang] = I18n.t(@i18n, locale: lang) % args_to(lang) if @i18n.present?
 
       if @instance.present? && @field.present?
-        return @i18ns[lang] = @instance.send(@field) unless @instance.translation.present?
+        return @i18ns[lang] = @instance.send(@field) unless @instance.respond_to?(:translation) && @instance.translation.present?
         return @i18ns[lang] = @instance.translation.translate(field: @field, lang: lang) || @instance.send(@field)
       end
 
@@ -541,6 +542,27 @@ def survey_response_on_create
     )
   end
 
+  def matching_on_create
+    return unless @record.position == 0
+    return unless instance = @record.instance
+    return unless match = @record.match
+    return unless moderator_id = ModerationServices.moderator_for_user(instance.user)&.id || match&.user_id
+
+    notify(
+      sender_id: moderator_id,
+      referent: match,
+      instance: match,
+      users: [instance.user],
+      params: {
+        object: I18nStruct.new(i18n: 'push_notifications.matching.create'),
+        content: I18nStruct.new(instance: match, field: :name),
+        extra: {
+          tracking: :matching
+        }
+      }
+    )
+  end
+
   # use params[:extra] to be compliant with v7
   def notify sender_id:, referent:, instance:, users:, params: {}
     notify_push(sender_id: sender_id, referent: referent, instance: instance, users: users, params: params)
diff --git a/config/locales/entourage.fr.yml b/config/locales/entourage.fr.yml
index 5fd414f42..ebfe9a444 100644
--- a/config/locales/entourage.fr.yml
+++ b/config/locales/entourage.fr.yml
@@ -388,6 +388,8 @@ fr:
       create_section: "Un voisin recherche un %s"
     survey_response:
       create: "%s a répondu à votre sondage : %s"
+    matching:
+      create: "Ce contenu pourrait vous intéresser"
 
   timeliner:
     h1:

From 9b9d2bdcefc91b0e4f054990b575d1556811eebd Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Tue, 29 Oct 2024 17:02:30 +0100
Subject: [PATCH 06/38] EN-7354 use new assistant

---
 app/jobs/openai_assistant_job.rb           |  20 ++--
 app/models/poi.rb                          |   2 +
 app/services/matching_services/client.rb   |   7 ++
 app/services/matching_services/connect.rb  | 130 +++++++++++++++++++++
 app/services/matching_services/response.rb |  70 +++++++++++
 5 files changed, 218 insertions(+), 11 deletions(-)
 create mode 100644 app/services/matching_services/client.rb
 create mode 100644 app/services/matching_services/connect.rb
 create mode 100644 app/services/matching_services/response.rb

diff --git a/app/jobs/openai_assistant_job.rb b/app/jobs/openai_assistant_job.rb
index e875b1999..8474b257d 100644
--- a/app/jobs/openai_assistant_job.rb
+++ b/app/jobs/openai_assistant_job.rb
@@ -10,22 +10,20 @@ def perform openai_assistant_id
 
     return unless instance = openai_assistant.instance
 
-    EntourageServices::Matcher.new(instance: instance).find_best_matches do |on|
-      on.success do |matches|
+    MatchingServices::Connect.new(instance: instance).perform do |on|
+      on.success do |response|
         openai_assistant.update_columns(
-          openai_assistant_id: matches['assistant_id'],
-          openai_thread_id: matches['thread_id'],
-          openai_run_id: matches['run_id'],
-          openai_message_id: matches['message_id'],
-          status: matches['status'],
+          openai_assistant_id: response.metadata[:assistant_id],
+          openai_thread_id: response.metadata[:thread_id],
+          openai_run_id: response.metadata[:run_id],
+          openai_message_id: response.metadata[:message_id],
+          status: nil,
           run_ends_at: Time.current,
           updated_at: Time.current
         )
 
-        matches['matchings'].each_with_index do |matching, index|
-          next unless parse_matching = EntourageServices::Matcher.parse_matching(matching)
-
-          instance.matchings.build(match: parse_matching, score: matching['score'], position: index)
+        response.each_recommandation do |matching, score, index|
+          instance.matchings.build(match: matching, score: score, position: index)
         end
 
         instance.save(validate: false)
diff --git a/app/models/poi.rb b/app/models/poi.rb
index 712f76b7b..750782fa5 100644
--- a/app/models/poi.rb
+++ b/app/models/poi.rb
@@ -58,6 +58,8 @@ def find_by_uuid uuid
         find(uuid)
       end
     end
+
+    alias_method :find_by_id_or_uuid, :find_by_uuid
   end
 
   def uuid
diff --git a/app/services/matching_services/client.rb b/app/services/matching_services/client.rb
new file mode 100644
index 000000000..19f1b1c09
--- /dev/null
+++ b/app/services/matching_services/client.rb
@@ -0,0 +1,7 @@
+module MatchingServices
+  class Client
+    def self.session
+      OpenAI::Client.new(access_token: ENV['OPENAI_API_KEY'])
+    end
+  end
+end
diff --git a/app/services/matching_services/connect.rb b/app/services/matching_services/connect.rb
new file mode 100644
index 000000000..0f35b4911
--- /dev/null
+++ b/app/services/matching_services/connect.rb
@@ -0,0 +1,130 @@
+module MatchingServices
+  class Connect
+    attr_reader :client, :callback, :assistant_id, :instance, :user
+
+    class MatcherCallback < Callback
+    end
+
+    def initialize instance:
+      @callback = MatcherCallback.new
+
+      @client = OpenAI::Client.new(access_token: ENV['OPENAI_API_KEY'])
+      @assistant_id = ENV['OPENAI_API_ASSISTANT_ID_2']
+
+      @instance = instance
+      @user = instance.user
+    end
+
+    def perform
+      yield callback if block_given?
+
+      # create new thread
+      thread = client.threads.create
+
+      # create instance message
+      message = client.messages.create(thread_id: thread['id'], parameters: user_message)
+
+      # run the thread
+      run = client.runs.create(thread_id: thread['id'], parameters: {
+        assistant_id: assistant_id,
+        max_prompt_tokens: 1024*16,
+        max_completion_tokens: 1024
+      })
+
+      # wait for completion
+      status = status_loop(thread['id'], run['id'])
+
+      return callback.on_failure.try(:call, "Failure status #{status}") unless ['completed', 'requires_action'].include?(status)
+
+      response = Response.new(response: find_run_message(thread['id'], run['id']))
+
+      return callback.on_failure.try(:call, "Response not valid") unless response.valid?
+
+      callback.on_success.try(:call, response)
+    rescue => e
+      callback.on_failure.try(:call, e.message)
+    end
+
+    private
+
+    def status_loop thread_id, run_id
+      status = nil
+
+      while true do
+        response = client.runs.retrieve(id: run_id, thread_id: thread_id)
+        status = response['status']
+
+        break if ['completed'].include?(status) # success
+        break if ['requires_action'].include?(status) # success
+        break if ['cancelled', 'failed', 'expired'].include?(status) # error
+        break if ['incomplete'].include?(status) # ???
+
+        sleep 1 if ['queued', 'in_progress', 'cancelling'].include?(status)
+      end
+
+      status
+    end
+
+    def find_run_message(thread_id, run_id)
+      messages = client.messages.list(thread_id: thread_id)
+      messages['data'].find { |message| message['run_id'] == run_id && message['role'] == 'assistant' }
+    end
+
+    def user_message
+      instance_class = if instance.respond_to?(:action) && instance.action?
+        instance.contribution? ? 'contribution' : 'solicitation'
+      else
+        instance.class.name.camelize.downcase
+      end
+
+      {
+        role: "user",
+        content: [{
+          type: "text",
+          text: "I created a #{instance_class} \"#{instance.name}\" : #{instance.description}. What are the most relevant recommandations? The following text contains all the possible recommandations."
+        }, {
+          type: "text",
+          text: get_recommandations.to_json
+        }]
+      }
+    end
+
+    def get_recommandations
+      {
+        recommandations: {
+          contributions: get_contributions.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
+          solicitations: get_solicitations.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
+          outings: get_outings.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
+          resources: get_resources.pluck(:uuid_v2, :name).map { |values| [:uuid_v2, :name].zip(values).to_h },
+          pois: get_pois.pluck(:source_id, :name).map { |values| [:source_id, :name].zip(values).to_h },
+        }
+      }
+    end
+
+    def get_contributions
+      return [] if instance.is_a?(Entourage) && instance.contribution?
+
+      ContributionServices::Finder.new(user, Hash.new).find_all.limit(100)
+    end
+
+    def get_solicitations
+      return [] if instance.is_a?(Entourage) && instance.solicitation?
+
+      SolicitationServices::Finder.new(user, Hash.new).find_all.limit(100)
+    end
+
+    def get_outings
+      OutingsServices::Finder.new(user, Hash.new).find_all.limit(100)
+    end
+
+    def get_resources
+      Resource.where(status: :active)
+    end
+
+    def get_pois
+      return unless instance.respond_to?(:latitude) && instance.respond_to?(:longitude)
+
+      Poi.validated.around(instance.latitude, instance.longitude, user.travel_distance).limit(300)
+    end
+  end
+end
diff --git a/app/services/matching_services/response.rb b/app/services/matching_services/response.rb
new file mode 100644
index 000000000..bfcf795fc
--- /dev/null
+++ b/app/services/matching_services/response.rb
@@ -0,0 +1,70 @@
+module MatchingServices
+  # response example
+  # {"recommandations"=>
+  #   [{
+  #     "type"=>"resource",
+  #     "id"=>"e8bWJqPHAcxY",
+  #     "name"=>"Sophie : les portraits des bénévoles",
+  #     "score"=>"0.96",
+  #     "explanation"=>"Ce ressource présente des histoires de bénévoles et peut vous inspirer pour obtenir de l'aide."
+  #   }]
+  # }
+
+  Response = Struct.new(:response) do
+    TYPES = %w{contribution solicitation outing resource poi}
+
+    def initialize(response: nil)
+      @response = response
+      @parsed_response = parsed_response
+    end
+
+    def valid?
+      recommandations.any?
+    end
+
+    def parsed_response
+      return unless content = @response["content"]
+      return unless content.any? && first_content = content[0]
+      return unless first_content["type"] == "text"
+
+      # escape potential rendering strings
+      JSON.parse(first_content["text"]["value"].strip.gsub("```json", "").gsub("`", ""))
+    end
+
+    def recommandations
+      return [] unless @parsed_response
+
+      @parsed_response["recommandations"]
+    end
+
+    def metadata
+      {
+        message_id: @response["id"],
+        assistant_id: @response["assistant_id"],
+        thread_id: @response["thread_id"],
+        run_id: @response["run_id"]
+      }
+    end
+
+    def best_recommandation
+      each_recommandation do |instance, score, explanation, index|
+        return {
+          instance: instance,
+          score: score,
+          explanation: explanation,
+          index: index,
+        }
+      end
+    end
+
+    def each_recommandation &block
+      recommandations.each_with_index do |recommandation, index|
+        next unless recommandation["id"]
+        next unless TYPES.include?(recommandation["type"])
+        next unless instance = recommandation["type"].classify.constantize.find_by_id_or_uuid(recommandation["id"])
+
+        yield(instance, recommandation["score"], recommandation["explanation"], index)
+      end
+    end
+  end
+end

From 4219713ff0072bd838b551e7bbd086d143c61034 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Mon, 4 Nov 2024 11:41:27 +0100
Subject: [PATCH 07/38] EN-7354 remove pois, resources from recommandations:
 instead, we use json files in assistant configuration

---
 app/services/matching_services/connect.rb | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/services/matching_services/connect.rb b/app/services/matching_services/connect.rb
index 0f35b4911..353a3ab59 100644
--- a/app/services/matching_services/connect.rb
+++ b/app/services/matching_services/connect.rb
@@ -94,9 +94,7 @@ def get_recommandations
         recommandations: {
           contributions: get_contributions.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
           solicitations: get_solicitations.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
-          outings: get_outings.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
-          resources: get_resources.pluck(:uuid_v2, :name).map { |values| [:uuid_v2, :name].zip(values).to_h },
-          pois: get_pois.pluck(:source_id, :name).map { |values| [:source_id, :name].zip(values).to_h },
+          outings: get_outings.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h }
         }
       }
     end
@@ -116,15 +114,5 @@ def get_solicitations
     def get_outings
       OutingsServices::Finder.new(user, Hash.new).find_all.limit(100)
     end
-
-    def get_resources
-      Resource.where(status: :active)
-    end
-
-    def get_pois
-      return unless instance.respond_to?(:latitude) && instance.respond_to?(:longitude)
-
-      Poi.validated.around(instance.latitude, instance.longitude, user.travel_distance).limit(300)
-    end
   end
 end

From 48787377b8d61e5ba454351059a7375aab30136d Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Mon, 4 Nov 2024 12:29:16 +0100
Subject: [PATCH 08/38] EN-7354 add explanation to matchings records

---
 app/jobs/openai_assistant_job.rb                          | 4 ++--
 db/migrate/20241104122500_add_explanation_to_matchings.rb | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20241104122500_add_explanation_to_matchings.rb

diff --git a/app/jobs/openai_assistant_job.rb b/app/jobs/openai_assistant_job.rb
index 8474b257d..095a6765d 100644
--- a/app/jobs/openai_assistant_job.rb
+++ b/app/jobs/openai_assistant_job.rb
@@ -22,8 +22,8 @@ def perform openai_assistant_id
           updated_at: Time.current
         )
 
-        response.each_recommandation do |matching, score, index|
-          instance.matchings.build(match: matching, score: score, position: index)
+        response.each_recommandation do |matching, score, explanation, index|
+          instance.matchings.build(match: matching, score: score, explanation: explanation, position: index)
         end
 
         instance.save(validate: false)
diff --git a/db/migrate/20241104122500_add_explanation_to_matchings.rb b/db/migrate/20241104122500_add_explanation_to_matchings.rb
new file mode 100644
index 000000000..85fa67df8
--- /dev/null
+++ b/db/migrate/20241104122500_add_explanation_to_matchings.rb
@@ -0,0 +1,5 @@
+class AddExplanationToMatchings < ActiveRecord::Migration[6.1]
+  def change
+    add_column :matchings, :explanation, :string, default: nil
+  end
+end

From bfef45bdcc91542775a3f1374a594a27dceaf1c9 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Wed, 6 Nov 2024 14:13:21 +0100
Subject: [PATCH 09/38] EN-7354 add a menu to only list actions

---
 app/controllers/admin/actions_controller.rb | 25 ++++++++
 app/models/action.rb                        | 10 ++++
 app/views/admin/actions/index.html.erb      | 66 +++++++++++++++++++++
 app/views/layouts/_admin_header.html.erb    |  1 +
 config/routes.rb                            | 14 +++++
 5 files changed, 116 insertions(+)
 create mode 100644 app/controllers/admin/actions_controller.rb
 create mode 100644 app/views/admin/actions/index.html.erb

diff --git a/app/controllers/admin/actions_controller.rb b/app/controllers/admin/actions_controller.rb
new file mode 100644
index 000000000..c3cbbfceb
--- /dev/null
+++ b/app/controllers/admin/actions_controller.rb
@@ -0,0 +1,25 @@
+module Admin
+  class ActionsController < Admin::BaseController
+    layout 'admin_large'
+
+    def index
+      @params = params.permit([:area, :search]).to_h
+      @area = params[:area].presence&.to_sym || :all
+
+      @actions = Action.includes([:user, matchings: :match])
+      @actions = @actions.search_by(params[:search]) if params[:search].present?
+      @actions = @actions.with_moderation_area(@area.to_s) if @area && @area != :all
+      @actions = @actions.page(page).per(per)
+    end
+
+    private
+
+    def page
+      params[:page] || 1
+    end
+
+    def per
+      params[:per] || 25
+    end
+  end
+end
diff --git a/app/models/action.rb b/app/models/action.rb
index 73f37d5fc..bdd5b495b 100644
--- a/app/models/action.rb
+++ b/app/models/action.rb
@@ -6,6 +6,16 @@ class Action < Entourage
 
   default_scope { where(group_type: :action, entourage_type: [:ask_for_help, :contribution]).order(created_at: :desc) }
 
+  scope :with_moderation_area, -> (moderation_area) {
+    if moderation_area.present? && moderation_area.to_sym == :hors_zone
+      return where("left(postal_code, 2) not in (?)", ModerationArea.only_departements).or(
+        where.not(country: :FR)
+      )
+    end
+
+    where("left(postal_code, 2) = ?", ModerationArea.departement(moderation_area)).where(country: :FR)
+  }
+
   scope :filtered_with_user_profile, -> (user) {
     return where(entourage_type: :contribution) if user.is_ask_for_help?
 
diff --git a/app/views/admin/actions/index.html.erb b/app/views/admin/actions/index.html.erb
new file mode 100644
index 000000000..748a009ad
--- /dev/null
+++ b/app/views/admin/actions/index.html.erb
@@ -0,0 +1,66 @@
+<div class="container">
+  <div style="margin: auto">
+    <h1>Actions</h1>
+
+    <%= form_tag admin_actions_path, class: 'form-inline', method: :get do |f| %>
+      <div class="panel panel-default">
+        <div class="panel-body">
+            <div class='input-group'>
+              <%= text_field_tag :search, @params[:search], class: "form-control", placeholder: "Nom, description..." %>
+              <span class="input-group-btn">
+                <%= submit_tag "Chercher", class: "btn btn-default" %>
+              </span>
+            </div>
+        </div>
+        <div class="panel-body">
+          <div class="input-group">
+            <div class="btn-group btn-group-sm">
+              <%= link_to("Tous", @params.merge(area: :all), class: "btn btn-#{@area == :all ? :primary : :default}") %>
+              <% ModerationArea.by_slug_without_no_zone.sort.each do |slug, area| %>
+                <%= link_to(area.short_name, @params.merge(area: slug), class: "btn btn-#{@area == slug ? :primary : :default}") %>
+              <% end %>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% end %>
+
+    <div class="row">
+      <% unless @actions.none? %>
+        <table class="table custom-table">
+          <thead>
+            <th>Nom du groupe</th>
+            <th>Créateur</th>
+            <th>Code postal</th>
+            <th>Date de création</th>
+            <th>Statut</th>
+            <th>Matchings</th>
+          </thead>
+          <% @actions.each_with_index do |action, i| %>
+            <% parite = i.even? ? 'pair' : 'impair' %>
+
+            <tr class="above-row row-<%= parite %>">
+              <td><%= link_to action.name, edit_admin_entourage_path(action) %></td>
+              <td><%= link_to action.user.full_name, admin_user_path(action.user) %></td>
+              <td><%= action.postal_code %></td>
+              <td><%= l action.created_at, format: :date_short %></td>
+              <td><%= status_label action %></td>
+              <td>
+                <% action.matchings.each do |matching| %>
+                  <p>
+                    <%= "#{matching.match.name} : score #{matching.score} (#{matching.instance_type} : #{matching.explanation})" %>
+                  </p>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </table>
+      <% end %>
+    </div>
+
+    <%= page_entries_info @actions, entry_name: 'actions' %>
+    <div class="container">
+      <%= paginate(@actions) %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index 24c0e6c14..db4875213 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -51,6 +51,7 @@
           </a>
           <ul class="dropdown-menu">
             <li><%= link_to "Groupes de voisinage", admin_neighborhoods_path %></li>
+            <li><%= link_to "Actions", admin_actions_path %></li>
             <li><%= link_to "Associations - Demandes d'adhésion", admin_partner_registrations_path %></li>
             <li><%= link_to "Associations - Liste", admin_partners_path %></li>
             <li><%= link_to "Modération des photos de profils", moderate_admin_users_path %></li>
diff --git a/config/routes.rb b/config/routes.rb
index c23190320..2eb243f58 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -225,6 +225,20 @@
       end
     end
 
+    resources :actions, only: [:index] do
+      resources :matchings, :controller => 'actions/matchings', only: [:index] do
+        collection do
+          post :notify_best
+          post :mail_best
+        end
+
+        member do
+          post :notify
+          post :mail
+        end
+      end
+    end
+
     resources :neighborhoods, only: [:index, :edit, :update, :destroy] do
       member do
         put :reactivate

From dbf315387db4b98e63ffa230e44fd9d09962433f Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Wed, 6 Nov 2024 14:55:28 +0100
Subject: [PATCH 10/38] EN-7354 templating

---
 app/views/admin/actions/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/actions/index.html.erb b/app/views/admin/actions/index.html.erb
index 748a009ad..152e4787e 100644
--- a/app/views/admin/actions/index.html.erb
+++ b/app/views/admin/actions/index.html.erb
@@ -48,7 +48,7 @@
               <td>
                 <% action.matchings.each do |matching| %>
                   <p>
-                    <%= "#{matching.match.name} : score #{matching.score} (#{matching.instance_type} : #{matching.explanation})" %>
+                    <%= "#{matching.match.name} : score #{matching.score} (#{matching.match_type} : #{matching.explanation})" %>
                   </p>
                 <% end %>
               </td>

From 5a5602492d483ec03cdb0c8dae7558c32ccc7f95 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Wed, 27 Nov 2024 11:35:53 +0100
Subject: [PATCH 11/38] EN-7354 more robust .parsed_response and spec

---
 app/services/matching_services/response.rb    |  6 ++-
 .../matching_services/response_spec.rb        | 43 +++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 spec/services/matching_services/response_spec.rb

diff --git a/app/services/matching_services/response.rb b/app/services/matching_services/response.rb
index bfcf795fc..bb676e77a 100644
--- a/app/services/matching_services/response.rb
+++ b/app/services/matching_services/response.rb
@@ -23,12 +23,14 @@ def valid?
     end
 
     def parsed_response
+      return unless @response
       return unless content = @response["content"]
       return unless content.any? && first_content = content[0]
       return unless first_content["type"] == "text"
+      return unless value = first_content["text"]["value"]
+      return unless json = value[/\{.*\}/m]
 
-      # escape potential rendering strings
-      JSON.parse(first_content["text"]["value"].strip.gsub("```json", "").gsub("`", ""))
+      JSON.parse(json)
     end
 
     def recommandations
diff --git a/spec/services/matching_services/response_spec.rb b/spec/services/matching_services/response_spec.rb
new file mode 100644
index 000000000..78dbea7de
--- /dev/null
+++ b/spec/services/matching_services/response_spec.rb
@@ -0,0 +1,43 @@
+require 'rails_helper'
+
+describe MatchingServices::Response do
+  describe '#parsed_response' do
+    subject { described_class.new(response: response).parsed_response }
+
+    context 'when response is nil' do
+      let(:response) { nil }
+
+      it { expect(subject).to be_nil }
+    end
+
+    context 'when response has no content' do
+      let(:response) { { "content" => [] } }
+
+      it { expect(subject).to be_nil }
+    end
+
+    context 'when content type is not "text"' do
+      let(:response) { { "content" => [{ "type" => "image", "text" => { "value" => '{"key":"value"}' } }] } }
+
+      it { expect(subject).to be_nil }
+    end
+
+    context 'when content type is "text" but text is malformed' do
+      let(:response) { { "content" => [{ "type" => "text", "text" => { "value" => 'invalid json' } }] } }
+
+      it { expect(subject).to be_nil }
+    end
+
+    context 'when content type is "text" and text contains valid JSON' do
+      let(:response) { { "content" => [{ "type" => "text", "text" => { "value" => '{"key":"value"}' } }] } }
+
+      it { expect(subject).to eq({ "key" => "value" }) }
+    end
+
+    context 'when text contains extraneous data but valid JSON inside' do
+      let(:response) { { "content" => [{ "type" => "text", "text" => { "value" => 'Random text before ```json{"key":"value"}``` and after' } }] } }
+
+      it { expect(subject).to eq({ "key" => "value" }) }
+    end
+  end
+end

From 9d28c95fa100f4b262345f4956d046b8589d947c Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Wed, 27 Nov 2024 14:23:24 +0100
Subject: [PATCH 12/38] EN-7354 openai assistants are configured as
 active_records

---
 ...nai_assistant_configurations_controller.rb | 45 ++++++++++++++
 app/models/openai_assistant_configuration.rb  |  2 +
 app/services/matching_services/connect.rb     | 59 ++++++++++++++-----
 .../_edit_header.html.erb                     | 13 ++++
 .../_form.html.erb                            | 50 ++++++++++++++++
 .../edit.html.erb                             |  4 ++
 .../index.html.erb                            | 36 +++++++++++
 app/views/layouts/_admin_header.html.erb      |  1 +
 config/routes.rb                              |  2 +
 ..._create_openai_assistant_configurations.rb | 19 ++++++
 ...openai_assistant_configuration_instance.rb | 18 ++++++
 db/schema.rb                                  | 13 ++++
 spec/rails_helper.rb                          |  3 +
 13 files changed, 249 insertions(+), 16 deletions(-)
 create mode 100644 app/controllers/admin/openai_assistant_configurations_controller.rb
 create mode 100644 app/models/openai_assistant_configuration.rb
 create mode 100644 app/views/admin/openai_assistant_configurations/_edit_header.html.erb
 create mode 100644 app/views/admin/openai_assistant_configurations/_form.html.erb
 create mode 100644 app/views/admin/openai_assistant_configurations/edit.html.erb
 create mode 100644 app/views/admin/openai_assistant_configurations/index.html.erb
 create mode 100644 db/migrate/20241127115900_create_openai_assistant_configurations.rb
 create mode 100644 db/migrate/20241127115901_create_openai_assistant_configuration_instance.rb

diff --git a/app/controllers/admin/openai_assistant_configurations_controller.rb b/app/controllers/admin/openai_assistant_configurations_controller.rb
new file mode 100644
index 000000000..860b24d0a
--- /dev/null
+++ b/app/controllers/admin/openai_assistant_configurations_controller.rb
@@ -0,0 +1,45 @@
+module Admin
+  class OpenaiAssistantConfigurationsController < Admin::BaseController
+    layout 'admin_large'
+
+    before_action :set_openai_assistant_configuration, only: [:edit, :update]
+
+    def index
+      @openai_assistant_configurations = OpenaiAssistantConfiguration.all
+        .order(:version)
+        .page(page)
+        .per(per)
+    end
+
+    def edit
+    end
+
+    def update
+      @openai_assistant_configuration.assign_attributes(openai_assistant_configuration_params)
+
+      if @openai_assistant_configuration.save
+        redirect_to edit_admin_openai_assistant_configuration_path(@openai_assistant_configuration)
+      else
+        render :edit
+      end
+    end
+
+    private
+
+    def set_openai_assistant_configuration
+      @openai_assistant_configuration = OpenaiAssistantConfiguration.find(params[:id])
+    end
+
+    def openai_assistant_configuration_params
+      params.require(:openai_assistant_configuration).permit(:prompt, :days_for_actions, :days_for_outings, :poi_from_file, :resource_from_file)
+    end
+
+    def page
+      params[:page] || 1
+    end
+
+    def per
+      params[:per] || 25
+    end
+  end
+end
diff --git a/app/models/openai_assistant_configuration.rb b/app/models/openai_assistant_configuration.rb
new file mode 100644
index 000000000..ae5944e2c
--- /dev/null
+++ b/app/models/openai_assistant_configuration.rb
@@ -0,0 +1,2 @@
+class OpenaiAssistantConfiguration < ApplicationRecord
+end
diff --git a/app/services/matching_services/connect.rb b/app/services/matching_services/connect.rb
index 353a3ab59..5e6c2b69a 100644
--- a/app/services/matching_services/connect.rb
+++ b/app/services/matching_services/connect.rb
@@ -1,6 +1,6 @@
 module MatchingServices
   class Connect
-    attr_reader :client, :callback, :assistant_id, :instance, :user
+    attr_reader :configuration, :client, :callback, :assistant_id, :instance, :user
 
     class MatcherCallback < Callback
     end
@@ -8,8 +8,10 @@ class MatcherCallback < Callback
     def initialize instance:
       @callback = MatcherCallback.new
 
-      @client = OpenAI::Client.new(access_token: ENV['OPENAI_API_KEY'])
-      @assistant_id = ENV['OPENAI_API_ASSISTANT_ID_2']
+      @configuration = OpenaiAssistantConfiguration.find_by_version(1)
+
+      @client = OpenAI::Client.new(access_token: @configuration.api_key)
+      @assistant_id = @configuration.assistant_id
 
       @instance = instance
       @user = instance.user
@@ -71,22 +73,26 @@ def find_run_message(thread_id, run_id)
     end
 
     def user_message
+      {
+        role: "user",
+        content: [
+          { type: "text", text: get_formatted_prompt },
+          { type: "text", text: get_recommandations.to_json }
+        ]
+      }
+    end
+
+    def get_formatted_prompt
       instance_class = if instance.respond_to?(:action) && instance.action?
         instance.contribution? ? 'contribution' : 'solicitation'
       else
         instance.class.name.camelize.downcase
       end
 
-      {
-        role: "user",
-        content: [{
-          type: "text",
-          text: "I created a #{instance_class} \"#{instance.name}\" : #{instance.description}. What are the most relevant recommandations? The following text contains all the possible recommandations."
-        }, {
-          type: "text",
-          text: get_recommandations.to_json
-        }]
-      }
+      @configuration.prompt
+        .gsub("{{action_type}}", instance_class)
+        .gsub("{{name}}", instance.name)
+        .gsub("{{description}}", instance.description)
     end
 
     def get_recommandations
@@ -102,17 +108,38 @@ def get_recommandations
     def get_contributions
       return [] if instance.is_a?(Entourage) && instance.contribution?
 
-      ContributionServices::Finder.new(user, Hash.new).find_all.limit(100)
+      ContributionServices::Finder.new(user, Hash.new)
+        .find_all
+        .where("created_at > ?", @configuration.days_for_actions.days.ago)
+        .limit(100)
     end
 
     def get_solicitations
       return [] if instance.is_a?(Entourage) && instance.solicitation?
 
-      SolicitationServices::Finder.new(user, Hash.new).find_all.limit(100)
+      SolicitationServices::Finder.new(user, Hash.new)
+        .find_all
+        .where("created_at > ?", @configuration.days_for_actions.days.ago)
+        .limit(100)
     end
 
     def get_outings
-      OutingsServices::Finder.new(user, Hash.new).find_all.limit(100)
+      OutingsServices::Finder.new(user, Hash.new)
+        .find_all
+        .between(Time.zone.now, @configuration.days_for_outings.days.from_now)
+        .limit(100)
+    end
+
+    def get_pois
+      return unless @configuration.poi_from_file
+
+      Poi.validated.around(instance.latitude, instance.longitude, user.travel_distance).limit(300)
+    end
+
+    def get_resources
+      return unless @configuration.resource_from_file
+
+      Resource.where(status: :active)
     end
   end
 end
diff --git a/app/views/admin/openai_assistant_configurations/_edit_header.html.erb b/app/views/admin/openai_assistant_configurations/_edit_header.html.erb
new file mode 100644
index 000000000..a623580b4
--- /dev/null
+++ b/app/views/admin/openai_assistant_configurations/_edit_header.html.erb
@@ -0,0 +1,13 @@
+  <div class="row">
+    <ol class="breadcrumb">
+      <li><%= link_to "openai_assistant_configurations", admin_openai_assistant_configurations_path %></li>
+      <li class="active">Modifier</li>
+      <li style="float: right;">
+        Version <%= @openai_assistant_configuration.version %>
+      </li>
+    </ol>
+
+    <h2>
+      <span class="text-muted"># Version <%= @openai_assistant_configuration.version %></span>
+    </h2>
+  </div>
diff --git a/app/views/admin/openai_assistant_configurations/_form.html.erb b/app/views/admin/openai_assistant_configurations/_form.html.erb
new file mode 100644
index 000000000..51514cd04
--- /dev/null
+++ b/app/views/admin/openai_assistant_configurations/_form.html.erb
@@ -0,0 +1,50 @@
+<style>
+  .field_with_errors { display: inline-block }
+</style>
+
+<%= render partial: 'common/errors', locals: { obj: @openai_assistant_configuration } %>
+
+<%= form_for [:admin, @openai_assistant_configuration], html: { role: "form" } do |f| %>
+  <div class="form-group">
+    <%= f.label :prompt %>
+    <div class="controls">
+      <%= f.text_area :prompt, class: "form-control", required: true %>
+    </div>
+    <i>{{action_type}} : en fonction de l'action créée par l'utilisateur, sera remplacé par "contribution" ou "solicitation"</i><br/>
+    <i>{{name}} : nom de l'action créée par l'utilisateur</i><br/>
+    <i>{{description}} : description de l'action créée par l'utilisateur</i><br/>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :days_for_actions %>
+    <div class="controls">
+      <%= f.number_field :days_for_actions, class: "form-control", required: true %>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :days_for_outings %>
+    <div class="controls">
+      <%= f.number_field :days_for_outings, class: "form-control", required: true %>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :poi_from_file, "Charger les points d'intérêt depuis un fichier ?" %>
+    <div class="controls">
+      <%= f.radio_button :poi_from_file, true %> Oui
+      <%= f.radio_button :poi_from_file, false %> Non
+    </div>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :resource_from_file, "Charger les ressources pédagogiques depuis un fichier ?" %>
+    <div class="controls">
+      <%= f.radio_button :resource_from_file, true %> Oui
+      <%= f.radio_button :resource_from_file, false %> Non
+    </div>
+  </div>
+
+  <%= f.submit 'Enregistrer', class: "btn btn-primary" %>
+  <%= link_to "Retour", admin_openai_assistant_configurations_path, class: "btn btn-default" %>
+<% end %>
diff --git a/app/views/admin/openai_assistant_configurations/edit.html.erb b/app/views/admin/openai_assistant_configurations/edit.html.erb
new file mode 100644
index 000000000..77d53a80c
--- /dev/null
+++ b/app/views/admin/openai_assistant_configurations/edit.html.erb
@@ -0,0 +1,4 @@
+<div class="container">
+  <%= render 'edit_header', tab: :edit %>
+  <%= render partial: 'form' %>
+</div>
diff --git a/app/views/admin/openai_assistant_configurations/index.html.erb b/app/views/admin/openai_assistant_configurations/index.html.erb
new file mode 100644
index 000000000..2398f383b
--- /dev/null
+++ b/app/views/admin/openai_assistant_configurations/index.html.erb
@@ -0,0 +1,36 @@
+<div class="container">
+  <div style="margin: auto">
+    <h1>openai_assistant_configuration</h1>
+
+    <div class="row">
+      <% unless @openai_assistant_configurations.none? %>
+        <table class="table custom-table">
+          <thead>
+            <th>Version</th>
+            <th>Prompt</th>
+            <th>poi_from_file</th>
+            <th>resource_from_file</th>
+            <th>days_for_actions</th>
+            <th>days_for_outings</th>
+          </thead>
+          <% @openai_assistant_configurations.each_with_index do |openai_assistant_configuration, i| %>
+            <% parite = i.even? ? 'pair' : 'impair' %>
+
+            <tr class="above-row row-<%= parite %>">
+              <td><%= link_to openai_assistant_configuration.version, edit_admin_openai_assistant_configuration_path(openai_assistant_configuration) %></td>
+              <td><%= link_to openai_assistant_configuration.prompt, edit_admin_openai_assistant_configuration_path(openai_assistant_configuration) %></td>
+              <td><%= openai_assistant_configuration.poi_from_file %></td>
+              <td><%= openai_assistant_configuration.resource_from_file %></td>
+              <td><%= openai_assistant_configuration.days_for_actions %></td>
+              <td><%= openai_assistant_configuration.days_for_outings %></td>
+          <% end %>
+        </table>
+      <% end %>
+    </div>
+
+    <%= page_entries_info @openai_assistant_configurations, entry_name: 'openai_assistant_configurations' %>
+    <div class="container">
+      <%= paginate(@openai_assistant_configurations) %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index db4875213..25d84256d 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -19,6 +19,7 @@
             Superadmin
           </a>
           <ul class="dropdown-menu">
+            <li><%= link_to "openai_assistant_configurations", admin_openai_assistant_configurations_path %></li>
             <li><%= link_to "Options", admin_options_path %></li>
             <li><%= link_to "Soliguide", admin_super_admin_soliguide_path %></li>
             <li><%= link_to "Sidekiq", sidekiq_web_path %></li>
diff --git a/config/routes.rb b/config/routes.rb
index 2eb243f58..d00fcd06d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -266,6 +266,8 @@
       end
     end
 
+    resources :openai_assistant_configurations, only: [:index, :edit, :update]
+
     resources :recommandations do
       member do
         get '/edit/image', action: :edit_image
diff --git a/db/migrate/20241127115900_create_openai_assistant_configurations.rb b/db/migrate/20241127115900_create_openai_assistant_configurations.rb
new file mode 100644
index 000000000..fb7e0efb3
--- /dev/null
+++ b/db/migrate/20241127115900_create_openai_assistant_configurations.rb
@@ -0,0 +1,19 @@
+class CreateOpenaiAssistantConfigurations < ActiveRecord::Migration[6.1]
+  def change
+    create_table :openai_assistant_configurations do |t|
+      t.integer :version, unique: true
+      t.string :api_key, null: false
+      t.string :assistant_id, null: false
+
+      t.text :prompt, null: false
+
+      t.boolean :poi_from_file, default: false
+      t.boolean :resource_from_file, default: false
+
+      t.integer :days_for_actions, default: 30
+      t.integer :days_for_outings, default: 30
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/migrate/20241127115901_create_openai_assistant_configuration_instance.rb b/db/migrate/20241127115901_create_openai_assistant_configuration_instance.rb
new file mode 100644
index 000000000..840d5a8e3
--- /dev/null
+++ b/db/migrate/20241127115901_create_openai_assistant_configuration_instance.rb
@@ -0,0 +1,18 @@
+class CreateOpenaiAssistantConfigurationInstance < ActiveRecord::Migration[6.1]
+  def change
+    unless Rails.env.test?
+      prompt = "I created a {{action_type}} \"{{name}}\" : {{description}}. What are the most relevant recommandations? The following text contains all the possible recommandations."
+
+      OpenaiAssistantConfiguration.new(
+        version: 1,
+        api_key: ENV['OPENAI_API_KEY'],
+        assistant_id: ENV['OPENAI_API_ASSISTANT_ID'],
+        prompt: prompt,
+        poi_from_file: true,
+        resource_from_file: true,
+        days_for_actions: 30,
+        days_for_outings: 30
+      ).save
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 19a9d5709..a71ed871c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -762,6 +762,19 @@
     t.index ["user_id"], name: "index_old_user_denorms_on_user_id"
   end
 
+  create_table "openai_assistant_configurations", force: :cascade do |t|
+    t.integer "version"
+    t.string "api_key", null: false
+    t.string "assistant_id", null: false
+    t.text "prompt", null: false
+    t.boolean "poi_from_file", default: false
+    t.boolean "resource_from_file", default: false
+    t.integer "days_for_actions", default: 30
+    t.integer "days_for_outings", default: 30
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
   create_table "openai_assistants", force: :cascade do |t|
     t.integer "version"
     t.string "api_key", null: false
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c9024fff4..9d93217e5 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -27,6 +27,9 @@
     # deactivate salesforce updates
     SalesforceJob.any_instance.stub(:perform).and_return(nil)
 
+    # deactivate openai assistant
+    OpenaiAssistantJob.any_instance.stub(:perform).and_return(nil)
+
     # deactivate translation on create
     # TranslationObserver.any_instance.stub(:action).and_return(nil)
     [ChatMessage, Entourage, Neighborhood].each do |klass|

From 1011ab971d79b82c71ddbf86ed78b4ce8d307dc5 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Thu, 28 Nov 2024 17:54:25 +0100
Subject: [PATCH 13/38] EN-7354 fix matchable instance_type and add rspec

---
 app/models/concerns/matchable.rb              | 10 +--
 ...165900_add_unicity_to_openai_assistants.rb |  7 ++
 ...add_instance_class_to_openai_assistants.rb |  5 ++
 spec/models/concerns/matchable_spec.rb        | 72 +++++++++++++++++++
 4 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20241128165900_add_unicity_to_openai_assistants.rb
 create mode 100644 db/migrate/20241128165901_add_instance_class_to_openai_assistants.rb
 create mode 100644 spec/models/concerns/matchable_spec.rb

diff --git a/app/models/concerns/matchable.rb b/app/models/concerns/matchable.rb
index eba0dbe60..d6061a306 100644
--- a/app/models/concerns/matchable.rb
+++ b/app/models/concerns/matchable.rb
@@ -9,6 +9,10 @@ module Matchable
     has_many :matches, through: :matchings, source: :match
   end
 
+  def build_openai_assistant(attributes = {})
+    super(attributes.merge(instance_class: self.class.name))
+  end
+
   def matchable_field_changed?
     previous_changes.slice(:title, :name, :description).present?
   end
@@ -31,11 +35,9 @@ def on_save
     end
 
     def ensure_openai_assistant_exists!
-      return if @instance.openai_assistant && @instance.openai_assistant.persisted?
+      return if @instance.openai_assistant
 
-      openai_assistant = (@instance.openai_assistant || @instance.build_openai_assistant)
-      openai_assistant.instance_type = @instance.class.name # forces "Action" rather than "Entourage"
-      openai_assistant.save!
+      @instance.build_openai_assistant.save!
     end
   end
 end
diff --git a/db/migrate/20241128165900_add_unicity_to_openai_assistants.rb b/db/migrate/20241128165900_add_unicity_to_openai_assistants.rb
new file mode 100644
index 000000000..2f305f841
--- /dev/null
+++ b/db/migrate/20241128165900_add_unicity_to_openai_assistants.rb
@@ -0,0 +1,7 @@
+class AddUnicityToOpenaiAssistants < ActiveRecord::Migration[6.1]
+  def change
+    remove_index :openai_assistants, [:instance_type, :instance_id]
+
+    add_index :openai_assistants, [:instance_type, :instance_id], unique: true
+  end
+end
diff --git a/db/migrate/20241128165901_add_instance_class_to_openai_assistants.rb b/db/migrate/20241128165901_add_instance_class_to_openai_assistants.rb
new file mode 100644
index 000000000..48fc63a1e
--- /dev/null
+++ b/db/migrate/20241128165901_add_instance_class_to_openai_assistants.rb
@@ -0,0 +1,5 @@
+class AddInstanceClassToOpenaiAssistants < ActiveRecord::Migration[6.1]
+  def change
+    add_column :openai_assistants, :instance_class, :string, default: "Entourage"
+  end
+end
diff --git a/spec/models/concerns/matchable_spec.rb b/spec/models/concerns/matchable_spec.rb
new file mode 100644
index 000000000..12bc90cda
--- /dev/null
+++ b/spec/models/concerns/matchable_spec.rb
@@ -0,0 +1,72 @@
+require 'rails_helper'
+
+RSpec.describe Matchable, type: :module do
+  let(:action) { create(:contribution) }
+
+  describe 'included methods' do
+    it 'adds the required associations' do
+      expect(Action.reflect_on_association(:openai_assistant).macro).to eq(:has_one)
+      expect(Action.reflect_on_association(:matchings).macro).to eq(:has_many)
+      expect(Action.reflect_on_association(:matches).macro).to eq(:has_many)
+    end
+  end
+
+  describe '#matchable_field_changed?' do
+    it 'returns true if any of the fields :title, :name, :description have changed' do
+      action.update_attribute(:title, 'Updated Title')
+      expect(action.matchable_field_changed?).to be true
+    end
+
+    it 'returns false if none of the specified fields have changed' do
+      action.touch # Updates `updated_at` but no other fields
+      expect(action.matchable_field_changed?).to be false
+    end
+  end
+
+  describe '#match_on_save' do
+    before do
+      allow(action).to receive(:matchable_field_changed?).and_return(true)
+      allow_any_instance_of(Matchable::MatchStruct).to receive(:on_save)
+    end
+
+    it 'calls match.on_save if matchable_field_changed? is true' do
+      expect_any_instance_of(Matchable::MatchStruct).to receive(:on_save)
+      action.save!
+    end
+
+    it 'does not call match.on_save if matchable_field_changed? is false' do
+      allow(action).to receive(:matchable_field_changed?).and_return(false)
+      expect_any_instance_of(Matchable::MatchStruct).not_to receive(:on_save)
+      action.save!
+    end
+  end
+
+  describe 'MatchStruct' do
+    subject(:match_struct) { action.match }
+
+    before { allow_any_instance_of(Action).to receive(:matchable_field_changed?).and_return(false) }
+
+    describe '#on_save' do
+      context 'when openai_assistant exists and is persisted' do
+        let!(:openai_assistant) { action.create_openai_assistant(instance: action) }
+
+        it 'does not create a new openai_assistant' do
+          expect { match_struct.on_save }.not_to change(OpenaiAssistant, :count)
+        end
+      end
+
+      context 'when openai_assistant does not exist' do
+        context 'creates a new openai_assistant' do
+          it { expect { match_struct.on_save }.to change(OpenaiAssistant, :count).by(1) }
+        end
+
+        context 'associates the openai_assistant to the correct instance' do
+          before { match_struct.on_save }
+
+          it { expect(OpenaiAssistant.where(instance: action).count).to eq(1) }
+          it { expect(OpenaiAssistant.where(instance: action, instance_class: "Contribution").count).to eq(1) }
+        end
+      end
+    end
+  end
+end

From 49f3de59c82926a986e34956df07929a9a334570 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Thu, 28 Nov 2024 17:54:32 +0100
Subject: [PATCH 14/38] rename rspec

---
 .../concerns/{reactionnable_rspec.rb => reactionnable_spec.rb}    | 0
 .../concerns/{translatable_rspec.rb => translatable_spec.rb}      | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename spec/models/concerns/{reactionnable_rspec.rb => reactionnable_spec.rb} (100%)
 rename spec/models/concerns/{translatable_rspec.rb => translatable_spec.rb} (100%)

diff --git a/spec/models/concerns/reactionnable_rspec.rb b/spec/models/concerns/reactionnable_spec.rb
similarity index 100%
rename from spec/models/concerns/reactionnable_rspec.rb
rename to spec/models/concerns/reactionnable_spec.rb
diff --git a/spec/models/concerns/translatable_rspec.rb b/spec/models/concerns/translatable_spec.rb
similarity index 100%
rename from spec/models/concerns/translatable_rspec.rb
rename to spec/models/concerns/translatable_spec.rb

From a18bfa1e8e5a1c345d59d460d1ca766b6b837fd4 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Thu, 28 Nov 2024 18:00:22 +0100
Subject: [PATCH 15/38] EN-7354 rename openai_assistant_job to
 openai_request_job

---
 app/jobs/{openai_assistant_job.rb => openai_request_job.rb} | 4 ++--
 app/models/openai_assistant.rb                              | 2 +-
 spec/rails_helper.rb                                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename app/jobs/{openai_assistant_job.rb => openai_request_job.rb} (93%)

diff --git a/app/jobs/openai_assistant_job.rb b/app/jobs/openai_request_job.rb
similarity index 93%
rename from app/jobs/openai_assistant_job.rb
rename to app/jobs/openai_request_job.rb
index 095a6765d..b410f03a4 100644
--- a/app/jobs/openai_assistant_job.rb
+++ b/app/jobs/openai_request_job.rb
@@ -1,6 +1,6 @@
 require 'json'
 
-class OpenaiAssistantJob
+class OpenaiRequestJob
   include Sidekiq::Worker
 
   sidekiq_options :retry => false, queue: :openai_assistants
@@ -40,6 +40,6 @@ def perform openai_assistant_id
   end
 
   def self.perform_later openai_assistant_id
-    OpenaiAssistantJob.perform_async(openai_assistant_id)
+    OpenaiRequestJob.perform_async(openai_assistant_id)
   end
 end
diff --git a/app/models/openai_assistant.rb b/app/models/openai_assistant.rb
index 93aba59bb..92a7b6892 100644
--- a/app/models/openai_assistant.rb
+++ b/app/models/openai_assistant.rb
@@ -6,6 +6,6 @@ class OpenaiAssistant < ApplicationRecord
   attr_accessor :forced_matching
 
   def run
-    OpenaiAssistantJob.perform_later(id)
+    OpenaiRequestJob.perform_later(id)
   end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 9d93217e5..4f081e5d4 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -28,7 +28,7 @@
     SalesforceJob.any_instance.stub(:perform).and_return(nil)
 
     # deactivate openai assistant
-    OpenaiAssistantJob.any_instance.stub(:perform).and_return(nil)
+    OpenaiRequestJob.any_instance.stub(:perform).and_return(nil)
 
     # deactivate translation on create
     # TranslationObserver.any_instance.stub(:action).and_return(nil)

From 13157ba1a8f8889589cd015953add0525ead6211 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Thu, 28 Nov 2024 18:09:23 +0100
Subject: [PATCH 16/38] EN-7354 rename openai_assistant to openai_request

---
 app/jobs/openai_request_job.rb                | 18 +++++++--------
 app/models/concerns/matchable.rb              | 12 +++++-----
 ...{openai_assistant.rb => openai_request.rb} |  2 +-
 ...me_openai_assistants_to_openai_requests.rb |  5 +++++
 db/schema.rb                                  | 13 -----------
 spec/models/concerns/matchable_spec.rb        | 22 +++++++++----------
 6 files changed, 32 insertions(+), 40 deletions(-)
 rename app/models/{openai_assistant.rb => openai_request.rb} (80%)
 create mode 100644 db/migrate/20241128165902_rename_openai_assistants_to_openai_requests.rb

diff --git a/app/jobs/openai_request_job.rb b/app/jobs/openai_request_job.rb
index b410f03a4..419ab5672 100644
--- a/app/jobs/openai_request_job.rb
+++ b/app/jobs/openai_request_job.rb
@@ -3,17 +3,17 @@
 class OpenaiRequestJob
   include Sidekiq::Worker
 
-  sidekiq_options :retry => false, queue: :openai_assistants
+  sidekiq_options :retry => false, queue: :openai_requests
 
-  def perform openai_assistant_id
-    openai_assistant = OpenaiAssistant.find(openai_assistant_id)
+  def perform openai_request_id
+    openai_request = OpenaiRequest.find(openai_request_id)
 
-    return unless instance = openai_assistant.instance
+    return unless instance = openai_request.instance
 
     MatchingServices::Connect.new(instance: instance).perform do |on|
       on.success do |response|
-        openai_assistant.update_columns(
-          openai_assistant_id: response.metadata[:assistant_id],
+        openai_request.update_columns(
+          openai_request_id: response.metadata[:assistant_id],
           openai_thread_id: response.metadata[:thread_id],
           openai_run_id: response.metadata[:run_id],
           openai_message_id: response.metadata[:message_id],
@@ -30,7 +30,7 @@ def perform openai_assistant_id
       end
 
       on.failure do |error|
-        openai_assistant.update_columns(
+        openai_request.update_columns(
           status: :error,
           run_ends_at: Time.current,
           updated_at: Time.current
@@ -39,7 +39,7 @@ def perform openai_assistant_id
     end
   end
 
-  def self.perform_later openai_assistant_id
-    OpenaiRequestJob.perform_async(openai_assistant_id)
+  def self.perform_later openai_request_id
+    OpenaiRequestJob.perform_async(openai_request_id)
   end
 end
diff --git a/app/models/concerns/matchable.rb b/app/models/concerns/matchable.rb
index d6061a306..9db754c74 100644
--- a/app/models/concerns/matchable.rb
+++ b/app/models/concerns/matchable.rb
@@ -4,12 +4,12 @@ module Matchable
   included do
     after_save :match_on_save, :if => :matchable_field_changed?
 
-    has_one :openai_assistant, as: :instance
+    has_one :openai_request, as: :instance
     has_many :matchings, as: :instance
     has_many :matches, through: :matchings, source: :match
   end
 
-  def build_openai_assistant(attributes = {})
+  def build_openai_request(attributes = {})
     super(attributes.merge(instance_class: self.class.name))
   end
 
@@ -31,13 +31,13 @@ def initialize instance: nil
     end
 
     def on_save
-      ensure_openai_assistant_exists!
+      ensure_openai_request_exists!
     end
 
-    def ensure_openai_assistant_exists!
-      return if @instance.openai_assistant
+    def ensure_openai_request_exists!
+      return if @instance.openai_request
 
-      @instance.build_openai_assistant.save!
+      @instance.build_openai_request.save!
     end
   end
 end
diff --git a/app/models/openai_assistant.rb b/app/models/openai_request.rb
similarity index 80%
rename from app/models/openai_assistant.rb
rename to app/models/openai_request.rb
index 92a7b6892..ed57838e2 100644
--- a/app/models/openai_assistant.rb
+++ b/app/models/openai_request.rb
@@ -1,4 +1,4 @@
-class OpenaiAssistant < ApplicationRecord
+class OpenaiRequest < ApplicationRecord
   belongs_to :instance, polymorphic: true
 
   after_commit :run, on: :create
diff --git a/db/migrate/20241128165902_rename_openai_assistants_to_openai_requests.rb b/db/migrate/20241128165902_rename_openai_assistants_to_openai_requests.rb
new file mode 100644
index 000000000..22f043d9b
--- /dev/null
+++ b/db/migrate/20241128165902_rename_openai_assistants_to_openai_requests.rb
@@ -0,0 +1,5 @@
+class RenameOpenaiAssistantsToOpenaiRequests < ActiveRecord::Migration[6.1]
+  def change
+    rename_table :openai_assistants, :openai_requests
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a71ed871c..53ba91b0e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -775,19 +775,6 @@
     t.datetime "updated_at", precision: 6, null: false
   end
 
-  create_table "openai_assistants", force: :cascade do |t|
-    t.integer "version"
-    t.string "api_key", null: false
-    t.string "assistant_id", null: false
-    t.text "prompt", null: false
-    t.boolean "poi_from_file", default: false
-    t.boolean "resource_from_file", default: false
-    t.integer "days_for_actions", default: 30
-    t.integer "days_for_outings", default: 30
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-  end
-
   create_table "openai_requests", force: :cascade do |t|
     t.string "instance_type", null: false
     t.integer "instance_id", null: false
diff --git a/spec/models/concerns/matchable_spec.rb b/spec/models/concerns/matchable_spec.rb
index 12bc90cda..dfdd591c9 100644
--- a/spec/models/concerns/matchable_spec.rb
+++ b/spec/models/concerns/matchable_spec.rb
@@ -5,7 +5,7 @@
 
   describe 'included methods' do
     it 'adds the required associations' do
-      expect(Action.reflect_on_association(:openai_assistant).macro).to eq(:has_one)
+      expect(Action.reflect_on_association(:openai_request).macro).to eq(:has_one)
       expect(Action.reflect_on_association(:matchings).macro).to eq(:has_many)
       expect(Action.reflect_on_association(:matches).macro).to eq(:has_many)
     end
@@ -47,24 +47,24 @@
     before { allow_any_instance_of(Action).to receive(:matchable_field_changed?).and_return(false) }
 
     describe '#on_save' do
-      context 'when openai_assistant exists and is persisted' do
-        let!(:openai_assistant) { action.create_openai_assistant(instance: action) }
+      context 'when openai_request exists and is persisted' do
+        let!(:openai_request) { action.create_openai_request(instance: action) }
 
-        it 'does not create a new openai_assistant' do
-          expect { match_struct.on_save }.not_to change(OpenaiAssistant, :count)
+        it 'does not create a new openai_request' do
+          expect { match_struct.on_save }.not_to change(OpenaiRequest, :count)
         end
       end
 
-      context 'when openai_assistant does not exist' do
-        context 'creates a new openai_assistant' do
-          it { expect { match_struct.on_save }.to change(OpenaiAssistant, :count).by(1) }
+      context 'when openai_request does not exist' do
+        context 'creates a new openai_request' do
+          it { expect { match_struct.on_save }.to change(OpenaiRequest, :count).by(1) }
         end
 
-        context 'associates the openai_assistant to the correct instance' do
+        context 'associates the openai_request to the correct instance' do
           before { match_struct.on_save }
 
-          it { expect(OpenaiAssistant.where(instance: action).count).to eq(1) }
-          it { expect(OpenaiAssistant.where(instance: action, instance_class: "Contribution").count).to eq(1) }
+          it { expect(OpenaiRequest.where(instance: action).count).to eq(1) }
+          it { expect(OpenaiRequest.where(instance: action, instance_class: "Contribution").count).to eq(1) }
         end
       end
     end

From 6de2da66ffd92cc38fa4b929b97656bbeac732da Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Thu, 28 Nov 2024 18:21:29 +0100
Subject: [PATCH 17/38] EN-7354 rename openai_assistant_configuration to
 openai_assistant

---
 ...nai_assistant_configurations_controller.rb | 45 -------------------
 .../admin/openai_assistants_controller.rb     | 45 +++++++++++++++++++
 app/models/openai_assistant.rb                |  2 +
 app/models/openai_assistant_configuration.rb  |  2 -
 app/services/matching_services/connect.rb     |  2 +-
 .../_edit_header.html.erb                     | 13 ------
 .../index.html.erb                            | 36 ---------------
 .../openai_assistants/_edit_header.html.erb   | 13 ++++++
 .../_form.html.erb                            |  6 +--
 .../edit.html.erb                             |  0
 .../admin/openai_assistants/index.html.erb    | 36 +++++++++++++++
 app/views/layouts/_admin_header.html.erb      |  2 +-
 config/routes.rb                              |  2 +-
 ...ant_configurations_to_openai_assistants.rb |  5 +++
 db/schema.rb                                  |  2 +-
 15 files changed, 108 insertions(+), 103 deletions(-)
 delete mode 100644 app/controllers/admin/openai_assistant_configurations_controller.rb
 create mode 100644 app/controllers/admin/openai_assistants_controller.rb
 create mode 100644 app/models/openai_assistant.rb
 delete mode 100644 app/models/openai_assistant_configuration.rb
 delete mode 100644 app/views/admin/openai_assistant_configurations/_edit_header.html.erb
 delete mode 100644 app/views/admin/openai_assistant_configurations/index.html.erb
 create mode 100644 app/views/admin/openai_assistants/_edit_header.html.erb
 rename app/views/admin/{openai_assistant_configurations => openai_assistants}/_form.html.erb (88%)
 rename app/views/admin/{openai_assistant_configurations => openai_assistants}/edit.html.erb (100%)
 create mode 100644 app/views/admin/openai_assistants/index.html.erb
 create mode 100644 db/migrate/20241128165903_rename_openai_assistant_configurations_to_openai_assistants.rb

diff --git a/app/controllers/admin/openai_assistant_configurations_controller.rb b/app/controllers/admin/openai_assistant_configurations_controller.rb
deleted file mode 100644
index 860b24d0a..000000000
--- a/app/controllers/admin/openai_assistant_configurations_controller.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-module Admin
-  class OpenaiAssistantConfigurationsController < Admin::BaseController
-    layout 'admin_large'
-
-    before_action :set_openai_assistant_configuration, only: [:edit, :update]
-
-    def index
-      @openai_assistant_configurations = OpenaiAssistantConfiguration.all
-        .order(:version)
-        .page(page)
-        .per(per)
-    end
-
-    def edit
-    end
-
-    def update
-      @openai_assistant_configuration.assign_attributes(openai_assistant_configuration_params)
-
-      if @openai_assistant_configuration.save
-        redirect_to edit_admin_openai_assistant_configuration_path(@openai_assistant_configuration)
-      else
-        render :edit
-      end
-    end
-
-    private
-
-    def set_openai_assistant_configuration
-      @openai_assistant_configuration = OpenaiAssistantConfiguration.find(params[:id])
-    end
-
-    def openai_assistant_configuration_params
-      params.require(:openai_assistant_configuration).permit(:prompt, :days_for_actions, :days_for_outings, :poi_from_file, :resource_from_file)
-    end
-
-    def page
-      params[:page] || 1
-    end
-
-    def per
-      params[:per] || 25
-    end
-  end
-end
diff --git a/app/controllers/admin/openai_assistants_controller.rb b/app/controllers/admin/openai_assistants_controller.rb
new file mode 100644
index 000000000..665a8ba16
--- /dev/null
+++ b/app/controllers/admin/openai_assistants_controller.rb
@@ -0,0 +1,45 @@
+module Admin
+  class OpenaiAssistantsController < Admin::BaseController
+    layout 'admin_large'
+
+    before_action :set_openai_assistant, only: [:edit, :update]
+
+    def index
+      @openai_assistants = OpenaiAssistant.all
+        .order(:version)
+        .page(page)
+        .per(per)
+    end
+
+    def edit
+    end
+
+    def update
+      @openai_assistant.assign_attributes(openai_assistant_params)
+
+      if @openai_assistant.save
+        redirect_to edit_admin_openai_assistant_path(@openai_assistant)
+      else
+        render :edit
+      end
+    end
+
+    private
+
+    def set_openai_assistant
+      @openai_assistant = OpenaiAssistant.find(params[:id])
+    end
+
+    def openai_assistant_params
+      params.require(:openai_assistant).permit(:prompt, :days_for_actions, :days_for_outings, :poi_from_file, :resource_from_file)
+    end
+
+    def page
+      params[:page] || 1
+    end
+
+    def per
+      params[:per] || 25
+    end
+  end
+end
diff --git a/app/models/openai_assistant.rb b/app/models/openai_assistant.rb
new file mode 100644
index 000000000..873d2d4c0
--- /dev/null
+++ b/app/models/openai_assistant.rb
@@ -0,0 +1,2 @@
+class OpenaiAssistant < ApplicationRecord
+end
diff --git a/app/models/openai_assistant_configuration.rb b/app/models/openai_assistant_configuration.rb
deleted file mode 100644
index ae5944e2c..000000000
--- a/app/models/openai_assistant_configuration.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class OpenaiAssistantConfiguration < ApplicationRecord
-end
diff --git a/app/services/matching_services/connect.rb b/app/services/matching_services/connect.rb
index 5e6c2b69a..38f439eaf 100644
--- a/app/services/matching_services/connect.rb
+++ b/app/services/matching_services/connect.rb
@@ -8,7 +8,7 @@ class MatcherCallback < Callback
     def initialize instance:
       @callback = MatcherCallback.new
 
-      @configuration = OpenaiAssistantConfiguration.find_by_version(1)
+      @configuration = OpenaiAssistant.find_by_version(1)
 
       @client = OpenAI::Client.new(access_token: @configuration.api_key)
       @assistant_id = @configuration.assistant_id
diff --git a/app/views/admin/openai_assistant_configurations/_edit_header.html.erb b/app/views/admin/openai_assistant_configurations/_edit_header.html.erb
deleted file mode 100644
index a623580b4..000000000
--- a/app/views/admin/openai_assistant_configurations/_edit_header.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-  <div class="row">
-    <ol class="breadcrumb">
-      <li><%= link_to "openai_assistant_configurations", admin_openai_assistant_configurations_path %></li>
-      <li class="active">Modifier</li>
-      <li style="float: right;">
-        Version <%= @openai_assistant_configuration.version %>
-      </li>
-    </ol>
-
-    <h2>
-      <span class="text-muted"># Version <%= @openai_assistant_configuration.version %></span>
-    </h2>
-  </div>
diff --git a/app/views/admin/openai_assistant_configurations/index.html.erb b/app/views/admin/openai_assistant_configurations/index.html.erb
deleted file mode 100644
index 2398f383b..000000000
--- a/app/views/admin/openai_assistant_configurations/index.html.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="container">
-  <div style="margin: auto">
-    <h1>openai_assistant_configuration</h1>
-
-    <div class="row">
-      <% unless @openai_assistant_configurations.none? %>
-        <table class="table custom-table">
-          <thead>
-            <th>Version</th>
-            <th>Prompt</th>
-            <th>poi_from_file</th>
-            <th>resource_from_file</th>
-            <th>days_for_actions</th>
-            <th>days_for_outings</th>
-          </thead>
-          <% @openai_assistant_configurations.each_with_index do |openai_assistant_configuration, i| %>
-            <% parite = i.even? ? 'pair' : 'impair' %>
-
-            <tr class="above-row row-<%= parite %>">
-              <td><%= link_to openai_assistant_configuration.version, edit_admin_openai_assistant_configuration_path(openai_assistant_configuration) %></td>
-              <td><%= link_to openai_assistant_configuration.prompt, edit_admin_openai_assistant_configuration_path(openai_assistant_configuration) %></td>
-              <td><%= openai_assistant_configuration.poi_from_file %></td>
-              <td><%= openai_assistant_configuration.resource_from_file %></td>
-              <td><%= openai_assistant_configuration.days_for_actions %></td>
-              <td><%= openai_assistant_configuration.days_for_outings %></td>
-          <% end %>
-        </table>
-      <% end %>
-    </div>
-
-    <%= page_entries_info @openai_assistant_configurations, entry_name: 'openai_assistant_configurations' %>
-    <div class="container">
-      <%= paginate(@openai_assistant_configurations) %>
-    </div>
-  </div>
-</div>
diff --git a/app/views/admin/openai_assistants/_edit_header.html.erb b/app/views/admin/openai_assistants/_edit_header.html.erb
new file mode 100644
index 000000000..38d4c6c29
--- /dev/null
+++ b/app/views/admin/openai_assistants/_edit_header.html.erb
@@ -0,0 +1,13 @@
+  <div class="row">
+    <ol class="breadcrumb">
+      <li><%= link_to "openai_assistants", admin_openai_assistants_path %></li>
+      <li class="active">Modifier</li>
+      <li style="float: right;">
+        Version <%= @openai_assistant.version %>
+      </li>
+    </ol>
+
+    <h2>
+      <span class="text-muted"># Version <%= @openai_assistant.version %></span>
+    </h2>
+  </div>
diff --git a/app/views/admin/openai_assistant_configurations/_form.html.erb b/app/views/admin/openai_assistants/_form.html.erb
similarity index 88%
rename from app/views/admin/openai_assistant_configurations/_form.html.erb
rename to app/views/admin/openai_assistants/_form.html.erb
index 51514cd04..c7bc16258 100644
--- a/app/views/admin/openai_assistant_configurations/_form.html.erb
+++ b/app/views/admin/openai_assistants/_form.html.erb
@@ -2,9 +2,9 @@
   .field_with_errors { display: inline-block }
 </style>
 
-<%= render partial: 'common/errors', locals: { obj: @openai_assistant_configuration } %>
+<%= render partial: 'common/errors', locals: { obj: @openai_assistant } %>
 
-<%= form_for [:admin, @openai_assistant_configuration], html: { role: "form" } do |f| %>
+<%= form_for [:admin, @openai_assistant], html: { role: "form" } do |f| %>
   <div class="form-group">
     <%= f.label :prompt %>
     <div class="controls">
@@ -46,5 +46,5 @@
   </div>
 
   <%= f.submit 'Enregistrer', class: "btn btn-primary" %>
-  <%= link_to "Retour", admin_openai_assistant_configurations_path, class: "btn btn-default" %>
+  <%= link_to "Retour", admin_openai_assistants_path, class: "btn btn-default" %>
 <% end %>
diff --git a/app/views/admin/openai_assistant_configurations/edit.html.erb b/app/views/admin/openai_assistants/edit.html.erb
similarity index 100%
rename from app/views/admin/openai_assistant_configurations/edit.html.erb
rename to app/views/admin/openai_assistants/edit.html.erb
diff --git a/app/views/admin/openai_assistants/index.html.erb b/app/views/admin/openai_assistants/index.html.erb
new file mode 100644
index 000000000..0bf7baab7
--- /dev/null
+++ b/app/views/admin/openai_assistants/index.html.erb
@@ -0,0 +1,36 @@
+<div class="container">
+  <div style="margin: auto">
+    <h1>openai_assistant</h1>
+
+    <div class="row">
+      <% unless @openai_assistants.none? %>
+        <table class="table custom-table">
+          <thead>
+            <th>Version</th>
+            <th>Prompt</th>
+            <th>poi_from_file</th>
+            <th>resource_from_file</th>
+            <th>days_for_actions</th>
+            <th>days_for_outings</th>
+          </thead>
+          <% @openai_assistants.each_with_index do |openai_assistant, i| %>
+            <% parite = i.even? ? 'pair' : 'impair' %>
+
+            <tr class="above-row row-<%= parite %>">
+              <td><%= link_to openai_assistant.version, edit_admin_openai_assistant_path(openai_assistant) %></td>
+              <td><%= link_to openai_assistant.prompt, edit_admin_openai_assistant_path(openai_assistant) %></td>
+              <td><%= openai_assistant.poi_from_file %></td>
+              <td><%= openai_assistant.resource_from_file %></td>
+              <td><%= openai_assistant.days_for_actions %></td>
+              <td><%= openai_assistant.days_for_outings %></td>
+          <% end %>
+        </table>
+      <% end %>
+    </div>
+
+    <%= page_entries_info @openai_assistants, entry_name: 'openai_assistants' %>
+    <div class="container">
+      <%= paginate(@openai_assistants) %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index 25d84256d..d2c7f75d8 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -19,7 +19,7 @@
             Superadmin
           </a>
           <ul class="dropdown-menu">
-            <li><%= link_to "openai_assistant_configurations", admin_openai_assistant_configurations_path %></li>
+            <li><%= link_to "openai_assistants", admin_openai_assistants_path %></li>
             <li><%= link_to "Options", admin_options_path %></li>
             <li><%= link_to "Soliguide", admin_super_admin_soliguide_path %></li>
             <li><%= link_to "Sidekiq", sidekiq_web_path %></li>
diff --git a/config/routes.rb b/config/routes.rb
index d00fcd06d..08d44f375 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -266,7 +266,7 @@
       end
     end
 
-    resources :openai_assistant_configurations, only: [:index, :edit, :update]
+    resources :openai_assistants, only: [:index, :edit, :update]
 
     resources :recommandations do
       member do
diff --git a/db/migrate/20241128165903_rename_openai_assistant_configurations_to_openai_assistants.rb b/db/migrate/20241128165903_rename_openai_assistant_configurations_to_openai_assistants.rb
new file mode 100644
index 000000000..81a96a69a
--- /dev/null
+++ b/db/migrate/20241128165903_rename_openai_assistant_configurations_to_openai_assistants.rb
@@ -0,0 +1,5 @@
+class RenameOpenaiAssistantConfigurationsToOpenaiAssistants < ActiveRecord::Migration[6.1]
+  def change
+    rename_table :openai_assistant_configurations, :openai_assistants
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 53ba91b0e..19a9d5709 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -762,7 +762,7 @@
     t.index ["user_id"], name: "index_old_user_denorms_on_user_id"
   end
 
-  create_table "openai_assistant_configurations", force: :cascade do |t|
+  create_table "openai_assistants", force: :cascade do |t|
     t.integer "version"
     t.string "api_key", null: false
     t.string "assistant_id", null: false

From 25cc4141215b9ff0c3b57a5269bff36abaa3f88b Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Fri, 29 Nov 2024 10:35:13 +0100
Subject: [PATCH 18/38] fix rspec

---
 spec/models/concerns/reactionnable_spec.rb | 16 +++++----
 spec/models/concerns/translatable_spec.rb  | 41 +++++++++-------------
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/spec/models/concerns/reactionnable_spec.rb b/spec/models/concerns/reactionnable_spec.rb
index bcdcd02a3..a3f1ef7c1 100644
--- a/spec/models/concerns/reactionnable_spec.rb
+++ b/spec/models/concerns/reactionnable_spec.rb
@@ -12,19 +12,21 @@
     let(:subject) { instance.reactions.summary }
 
     context "no reaction" do
-      it { expect(subject).to eq({}) }
+      it { expect(subject.count).to eq(0) }
     end
 
     context "no reaction on instance" do
       let!(:user_reaction) { create(:user_reaction) }
 
-      it { expect(subject).to eq({}) }
+      it { expect(subject.count).to eq(0) }
     end
 
     context "one reaction" do
       let!(:user_reaction) { create(:user_reaction, instance: instance, reaction: heart) }
 
-      it { expect(subject).to eq({ heart.id => 1 }) }
+      it { expect(subject).to match_array([
+        have_attributes(reaction_id: heart.id, reactions_count: 1)
+      ]) }
     end
 
     context "multiple reactions" do
@@ -32,10 +34,10 @@
       let!(:user_reaction_2) { create(:user_reaction, instance: instance, reaction: heart) }
       let!(:user_reaction_3) { create(:user_reaction, instance: instance, reaction: thumb) }
 
-      it { expect(subject).to eq({
-        heart.id => 2,
-        thumb.id => 1,
-      }) }
+      it { expect(subject).to match_array([
+        have_attributes(reaction_id: heart.id, reactions_count: 2),
+        have_attributes(reaction_id: thumb.id, reactions_count: 1)
+      ]) }
     end
   end
 
diff --git a/spec/models/concerns/translatable_spec.rb b/spec/models/concerns/translatable_spec.rb
index 16070b3ec..538bc884b 100644
--- a/spec/models/concerns/translatable_spec.rb
+++ b/spec/models/concerns/translatable_spec.rb
@@ -2,10 +2,14 @@
 
 describe Translatable do
   describe "translate_field!" do
-    let(:subject) { record.translate_field!(translation, field) }
+    let(:subject) { record.translate! }
     let(:translation) { Translation.find_or_initialize_by(instance: record) }
 
     before {
+      [ChatMessage, Entourage, Neighborhood].each do |klass|
+        klass.any_instance.stub(:translate_field!).and_call_original
+      end
+
       Translation::LANGUAGES.each do |lang|
         [Neighborhood, Entourage, ChatMessage].each do |klass|
           klass.any_instance.stub(:text_translation).with("Foo", lang) { "Foo+#{lang}" }
@@ -14,35 +18,25 @@
       end
     }
 
-    context "neighborhood" do
-      let(:record) { create(:neighborhood, name: "Foo", description: "Bar") }
-
-      context "nil translation_key" do
-        let(:field) { nil }
-
-        it { expect(subject).to eq(nil) }
+    after {
+      [ChatMessage, Entourage, Neighborhood].each do |klass|
+        klass.any_instance.stub(:translate_field!).and_return("foo")
       end
+    }
 
-      context "wrong translation_key" do
-        let(:field) { :Bar }
-
-        it { expect(subject).to eq(nil) }
-      end
+    context "neighborhood" do
+      let(:record) { create(:neighborhood, name: "Foo", description: "Bar") }
 
       context "good translation_key" do
-        let(:field) { :name }
-
         it { expect(subject).to eq(true) }
         it { expect { subject }.to change { Translation.count }.by(1) }
       end
 
       context "translations with correct translation_key" do
-        let(:field) { :name }
-
         before { subject }
 
         it { expect(translation).to be_a(Translation) }
-        it { expect(translation.fr.name).to eq("Foo+fr") }
+        it { expect(translation.fr.name).to eq("Foo") }
         it { expect(translation.en.name).to eq("Foo+en") }
         it { expect(translation.instance_type).to eq("Neighborhood") }
       end
@@ -52,27 +46,24 @@
       let(:record) { create(:outing, title: "Foo", description: "Bar") }
 
       context "translations with correct translation_key" do
-        let(:field) { :title }
-
         before { subject }
 
         it { expect(translation).to be_a(Translation) }
-        it { expect(translation.fr.title).to eq("Foo+fr") }
+        it { expect(translation.fr.title).to eq("Foo") }
         it { expect(translation.en.title).to eq("Foo+en") }
         it { expect(translation.instance_type).to eq("Entourage") }
       end
     end
 
     context "chat_message" do
-      let(:record) { create(:chat_message, content: "Foo") }
+      let(:outing) { create(:outing, title: "Foo", description: "Bar") }
+      let(:record) { create(:chat_message, messageable: outing, content: "Foo") }
 
       context "translations with correct translation_key" do
-        let(:field) { :content }
-
         before { subject }
 
         it { expect(translation).to be_a(Translation) }
-        it { expect(translation.fr.content).to eq("Foo+fr") }
+        it { expect(translation.fr.content).to eq("Foo") }
         it { expect(translation.en.content).to eq("Foo+en") }
         it { expect(translation.instance_type).to eq("ChatMessage") }
       end

From 6fb9fe999dcb4e66f23dee88eb03152f81a4e0d4 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Fri, 29 Nov 2024 13:55:34 +0100
Subject: [PATCH 19/38] EN-7354 fix condition

---
 app/services/matching_services/connect.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/matching_services/connect.rb b/app/services/matching_services/connect.rb
index 38f439eaf..4e3f9f580 100644
--- a/app/services/matching_services/connect.rb
+++ b/app/services/matching_services/connect.rb
@@ -131,13 +131,13 @@ def get_outings
     end
 
     def get_pois
-      return unless @configuration.poi_from_file
+      return if @configuration.poi_from_file
 
       Poi.validated.around(instance.latitude, instance.longitude, user.travel_distance).limit(300)
     end
 
     def get_resources
-      return unless @configuration.resource_from_file
+      return if @configuration.resource_from_file
 
       Resource.where(status: :active)
     end

From eab877d4cc2ee9ad50593196cef6c756209dff8b Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Fri, 29 Nov 2024 14:00:41 +0100
Subject: [PATCH 20/38] EN-7354 add pois, resources to recommandations

---
 app/services/matching_services/connect.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/services/matching_services/connect.rb b/app/services/matching_services/connect.rb
index 4e3f9f580..e299ad147 100644
--- a/app/services/matching_services/connect.rb
+++ b/app/services/matching_services/connect.rb
@@ -100,7 +100,9 @@ def get_recommandations
         recommandations: {
           contributions: get_contributions.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
           solicitations: get_solicitations.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
-          outings: get_outings.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h }
+          outings: get_outings.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
+          pois: get_pois.pluck(:uuid_v2, :name, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
+          resources: get_resources.pluck(:uuid_v2, :name, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h }
         }
       }
     end

From 1c6e4d72b93ec652c1924260a60de08116cad8ab Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Fri, 29 Nov 2024 15:03:52 +0100
Subject: [PATCH 21/38] EN-7354 include pois, resources and higher
 max_prompt_tokens to allow these resources

---
 app/services/matching_services/connect.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/services/matching_services/connect.rb b/app/services/matching_services/connect.rb
index e299ad147..0e2de6522 100644
--- a/app/services/matching_services/connect.rb
+++ b/app/services/matching_services/connect.rb
@@ -29,7 +29,7 @@ def perform
       # run the thread
       run = client.runs.create(thread_id: thread['id'], parameters: {
         assistant_id: assistant_id,
-        max_prompt_tokens: 1024*16,
+        max_prompt_tokens: 1024*1024,
         max_completion_tokens: 1024
       })
 
@@ -101,8 +101,8 @@ def get_recommandations
           contributions: get_contributions.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
           solicitations: get_solicitations.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
           outings: get_outings.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
-          pois: get_pois.pluck(:uuid_v2, :name, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
-          resources: get_resources.pluck(:uuid_v2, :name, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h }
+          pois: get_pois.pluck(:id, :name).map { |values| [:id, :name].zip(values).to_h },
+          resources: get_resources.pluck(:uuid_v2, :name, :description).map { |values| [:uuid_v2, :name, :description].zip(values).to_h }
         }
       }
     end

From fd59e44a4cfc604b8bad9e98b84bfe0115af6730 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Fri, 29 Nov 2024 15:04:04 +0100
Subject: [PATCH 22/38] update Procfile with queue

---
 Procfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Procfile b/Procfile
index aee929ede..97dc29e00 100644
--- a/Procfile
+++ b/Procfile
@@ -1,4 +1,4 @@
 web: bundle exec puma -C config/puma.rb
 worker_1: bundle exec sidekiq -c ${SIDEKIQ_CONCURRENCY:-2} -q sms -q salesforce -q translation
-worker_2: bundle exec sidekiq -c ${SIDEKIQ_CONCURRENCY:-10} -q mailers -q default -q openai_assistants -q broadcast -q denorm
+worker_2: bundle exec sidekiq -c ${SIDEKIQ_CONCURRENCY:-10} -q mailers -q default -q openai_requests -q broadcast -q denorm
 release: ACTIVERECORD_STATEMENT_TIMEOUT=90s bundle exec rake db:migrate

From d300331928a1d554bc4adf9aa23762dabc5b22ae Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Fri, 29 Nov 2024 15:04:36 +0100
Subject: [PATCH 23/38] EN-7354 backoffice add tab to display matchings

---
 .../admin/entourages_controller.rb            |  9 +++-
 app/views/admin/entourages/show.html.erb      |  6 +++
 .../entourages/show/_show_matchings.html.erb  | 41 +++++++++++++++++++
 config/routes.rb                              |  1 +
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 app/views/admin/entourages/show/_show_matchings.html.erb

diff --git a/app/controllers/admin/entourages_controller.rb b/app/controllers/admin/entourages_controller.rb
index 4c71d7ac8..df4af4d98 100644
--- a/app/controllers/admin/entourages_controller.rb
+++ b/app/controllers/admin/entourages_controller.rb
@@ -2,7 +2,7 @@ module Admin
   class EntouragesController < Admin::BaseController
     EXPORT_PERIOD = 1.month
 
-    before_action :set_entourage, only: [:show, :edit, :update, :close, :renew, :cancellation, :cancel, :edit_image, :update_image, :moderator_read, :moderator_unread, :message, :show_members, :show_joins, :show_invitations, :show_messages, :show_comments, :show_neighborhoods, :show_siblings, :sensitive_words, :sensitive_words_check, :edit_type, :edit_owner, :update_owner, :update_neighborhoods]
+    before_action :set_entourage, only: [:show, :edit, :update, :close, :renew, :cancellation, :cancel, :edit_image, :update_image, :moderator_read, :moderator_unread, :message, :show_members, :show_joins, :show_invitations, :show_messages, :show_comments, :show_neighborhoods, :show_matchings, :show_siblings, :sensitive_words, :sensitive_words_check, :edit_type, :edit_owner, :update_owner, :update_neighborhoods]
     before_action :set_forced_join_request, only: [:message]
 
     before_action :set_default_index_params, only: [:index]
@@ -162,6 +162,13 @@ def show_neighborhoods
       render :show
     end
 
+    def show_matchings
+      @action = Action.find(params[:id])
+      @matchings = @action.matchings
+
+      render :show
+    end
+
     def show_siblings
       @outing = Outing.find(params[:id])
       @siblings = @outing.siblings
diff --git a/app/views/admin/entourages/show.html.erb b/app/views/admin/entourages/show.html.erb
index ef746ab75..b4f4e5d12 100644
--- a/app/views/admin/entourages/show.html.erb
+++ b/app/views/admin/entourages/show.html.erb
@@ -41,11 +41,17 @@
             <%= link_to "Commentaires", "#" %>
           </li>
         <% end %>
+
         <% if @entourage.outing? %>
           <li role="presentation" class="<%= :active if params[:action] == 'show_neighborhoods' %>">
             <%= link_to "Groupes de voisins", show_neighborhoods_admin_entourage_path(@entourage, @params) %>
           </li>
+        <% else %>
+          <li role="presentation" class="<%= :active if params[:action] == 'show_matchings' %>">
+            <%= link_to "Matchings", show_matchings_admin_entourage_path(@entourage, @params) %>
+          </li>
         <% end %>
+
         <% if @entourage.recurrent? %>
           <li role="presentation" class="<%= :active if params[:action] == 'show_siblings' %>">
             <%= link_to "Récurrences", show_siblings_admin_entourage_path(@entourage, @params) %>
diff --git a/app/views/admin/entourages/show/_show_matchings.html.erb b/app/views/admin/entourages/show/_show_matchings.html.erb
new file mode 100644
index 000000000..411f8d3db
--- /dev/null
+++ b/app/views/admin/entourages/show/_show_matchings.html.erb
@@ -0,0 +1,41 @@
+<h4>Liste matchings</h4>
+
+<% if @action.matchings.none? %>
+  <div class="alert alert-info" role="alert" style="display: flex; align-items: center">
+    <div style="flex-grow: 1">
+      Cette action n'a pas de matching
+    </div>
+  </div>
+<% end %>
+
+<table id="matchings-list" class="table table-striped">
+  <% if @matchings.any? %>
+    <thead>
+      <tr>
+        <th>type</th>
+        <th>nom</th>
+        <th>description</th>
+        <th>score</th>
+        <th>position</th>
+        <th>explanation</th>
+        <th>created_at</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @matchings.each do |matching| %>
+        <tr>
+          <td><%= matching.match_type %></td>
+          <td><%= link_to matching.match.name, [:admin, matching.match] %></td>
+          <td><%= matching.match.description %></td>
+          <td><%= matching.score %></td>
+          <td><%= matching.position %></td>
+          <td><%= matching.explanation %></td>
+          <td><%= l matching.created_at.to_date, format: :long %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  <% else %>
+    <caption><%= "Il n'y a pas de matching."%></caption>
+  <% end %>
+</table>
diff --git a/config/routes.rb b/config/routes.rb
index 08d44f375..a48268741 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -127,6 +127,7 @@
           get :show_messages
           get :show_neighborhoods
           get 'comments/:message_id' => :show_comments, as: :show_comments
+          get :show_matchings
           get :show_siblings
           post :stop_recurrences
           get :sensitive_words

From 3b45f8b73182df0a294ea1ebc0b0ead05d878442 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Mon, 2 Dec 2024 12:29:55 +0100
Subject: [PATCH 24/38] EN-7354 fix various bugs: remove \n from json; find
 openai_request.instance from instance_class; fix wrong naming
 openai_request_id->openai_assistant_id

---
 app/jobs/openai_request_job.rb             | 2 +-
 app/models/openai_request.rb               | 4 ++++
 app/services/matching_services/response.rb | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/jobs/openai_request_job.rb b/app/jobs/openai_request_job.rb
index 419ab5672..14a425a06 100644
--- a/app/jobs/openai_request_job.rb
+++ b/app/jobs/openai_request_job.rb
@@ -13,7 +13,7 @@ def perform openai_request_id
     MatchingServices::Connect.new(instance: instance).perform do |on|
       on.success do |response|
         openai_request.update_columns(
-          openai_request_id: response.metadata[:assistant_id],
+          openai_assistant_id: response.metadata[:assistant_id],
           openai_thread_id: response.metadata[:thread_id],
           openai_run_id: response.metadata[:run_id],
           openai_message_id: response.metadata[:message_id],
diff --git a/app/models/openai_request.rb b/app/models/openai_request.rb
index ed57838e2..f4c7b53c8 100644
--- a/app/models/openai_request.rb
+++ b/app/models/openai_request.rb
@@ -3,6 +3,10 @@ class OpenaiRequest < ApplicationRecord
 
   after_commit :run, on: :create
 
+  def instance
+    instance_class.constantize.find(instance_id)
+  end
+
   attr_accessor :forced_matching
 
   def run
diff --git a/app/services/matching_services/response.rb b/app/services/matching_services/response.rb
index bb676e77a..eb8357798 100644
--- a/app/services/matching_services/response.rb
+++ b/app/services/matching_services/response.rb
@@ -27,7 +27,7 @@ def parsed_response
       return unless content = @response["content"]
       return unless content.any? && first_content = content[0]
       return unless first_content["type"] == "text"
-      return unless value = first_content["text"]["value"]
+      return unless value = first_content["text"]["value"]&.gsub("\n", "")
       return unless json = value[/\{.*\}/m]
 
       JSON.parse(json)

From d4d53b1007987544b3e3e97598bcf25cdc59eb38 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Mon, 2 Dec 2024 14:57:17 +0100
Subject: [PATCH 25/38] EN-7354 use serializer to allow resource.description
 formatting

---
 app/models/resource.rb                            |  8 ++++++++
 app/serializers/openai/contribution_serializer.rb |  5 +++++
 app/serializers/openai/outing_serializer.rb       |  5 +++++
 app/serializers/openai/poi_serializer.rb          |  5 +++++
 app/serializers/openai/resource_serializer.rb     |  9 +++++++++
 app/serializers/openai/solicitation_serializer.rb |  5 +++++
 app/services/matching_services/connect.rb         | 10 +++++-----
 7 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 app/serializers/openai/contribution_serializer.rb
 create mode 100644 app/serializers/openai/outing_serializer.rb
 create mode 100644 app/serializers/openai/poi_serializer.rb
 create mode 100644 app/serializers/openai/resource_serializer.rb
 create mode 100644 app/serializers/openai/solicitation_serializer.rb

diff --git a/app/models/resource.rb b/app/models/resource.rb
index ee0b1323a..1951bb17e 100644
--- a/app/models/resource.rb
+++ b/app/models/resource.rb
@@ -46,4 +46,12 @@ def resource_image_id= resource_image_id
   def remove_resource_image_id!
     self.image_url = nil
   end
+
+  def text_description_only
+    return description if is_video
+
+    document = Nokogiri::HTML(description)
+    document.css('img, a').each { |node| node.remove }
+    document.text.strip
+  end
 end
diff --git a/app/serializers/openai/contribution_serializer.rb b/app/serializers/openai/contribution_serializer.rb
new file mode 100644
index 000000000..fc569494a
--- /dev/null
+++ b/app/serializers/openai/contribution_serializer.rb
@@ -0,0 +1,5 @@
+module Openai
+  class ContributionSerializer < ActiveModel::Serializer
+    attributes :id, :name, :description
+  end
+end
diff --git a/app/serializers/openai/outing_serializer.rb b/app/serializers/openai/outing_serializer.rb
new file mode 100644
index 000000000..0801789db
--- /dev/null
+++ b/app/serializers/openai/outing_serializer.rb
@@ -0,0 +1,5 @@
+module Openai
+  class OutingSerializer < ActiveModel::Serializer
+    attributes :id, :name, :description
+  end
+end
diff --git a/app/serializers/openai/poi_serializer.rb b/app/serializers/openai/poi_serializer.rb
new file mode 100644
index 000000000..4be3130bb
--- /dev/null
+++ b/app/serializers/openai/poi_serializer.rb
@@ -0,0 +1,5 @@
+module Openai
+  class PoiSerializer < ActiveModel::Serializer
+    attributes :id, :name
+  end
+end
diff --git a/app/serializers/openai/resource_serializer.rb b/app/serializers/openai/resource_serializer.rb
new file mode 100644
index 000000000..b7f2dbc11
--- /dev/null
+++ b/app/serializers/openai/resource_serializer.rb
@@ -0,0 +1,9 @@
+module Openai
+  class ResourceSerializer < ActiveModel::Serializer
+    attributes :uuid_v2, :name, :is_video, :description
+
+    def description
+      object.text_description_only
+    end
+  end
+end
diff --git a/app/serializers/openai/solicitation_serializer.rb b/app/serializers/openai/solicitation_serializer.rb
new file mode 100644
index 000000000..cfa1a8e2a
--- /dev/null
+++ b/app/serializers/openai/solicitation_serializer.rb
@@ -0,0 +1,5 @@
+module Openai
+  class SolicitationSerializer < ActiveModel::Serializer
+    attributes :id, :name, :description
+  end
+end
diff --git a/app/services/matching_services/connect.rb b/app/services/matching_services/connect.rb
index 0e2de6522..e8b8fb856 100644
--- a/app/services/matching_services/connect.rb
+++ b/app/services/matching_services/connect.rb
@@ -98,11 +98,11 @@ def get_formatted_prompt
     def get_recommandations
       {
         recommandations: {
-          contributions: get_contributions.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
-          solicitations: get_solicitations.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
-          outings: get_outings.pluck(:uuid_v2, :title, :description).map { |values| [:uuid_v2, :title, :description].zip(values).to_h },
-          pois: get_pois.pluck(:id, :name).map { |values| [:id, :name].zip(values).to_h },
-          resources: get_resources.pluck(:uuid_v2, :name, :description).map { |values| [:uuid_v2, :name, :description].zip(values).to_h }
+          contributions: get_contributions.map { |contribution| Openai::ContributionSerializer.new(contribution).as_json },
+          solicitations: get_solicitations.map { |solicitation| Openai::SolicitationSerializer.new(solicitation).as_json },
+          outings: get_outings.map { |outing| Openai::OutingSerializer.new(outing).as_json },
+          pois: get_pois.map { |poi| Openai::PoiSerializer.new(poi).as_json },
+          resources: get_resources.map { |resource| Openai::ResourceSerializer.new(resource).as_json }
         }
       }
     end

From 67798032a8ff674a23ea4914e8192fda28ab2f0e Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:11:44 +0100
Subject: [PATCH 26/38] templating

---
 app/views/admin/entourages/show/_show_matchings.html.erb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/entourages/show/_show_matchings.html.erb b/app/views/admin/entourages/show/_show_matchings.html.erb
index 411f8d3db..c99081a0c 100644
--- a/app/views/admin/entourages/show/_show_matchings.html.erb
+++ b/app/views/admin/entourages/show/_show_matchings.html.erb
@@ -27,7 +27,13 @@
         <tr>
           <td><%= matching.match_type %></td>
           <td><%= link_to matching.match.name, [:admin, matching.match] %></td>
-          <td><%= matching.match.description %></td>
+          <td>
+            <% if matching.match.respond_to?(:text_description_only) %>
+              <%= matching.match.text_description_only %>
+            <% else %>
+              <%= matching.match.description %>
+            <% end %>
+          </td>
           <td><%= matching.score %></td>
           <td><%= matching.position %></td>
           <td><%= matching.explanation %></td>

From 115fd1bb8356c69a2e3875e6465c9ee1a0b15693 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Mon, 2 Dec 2024 16:27:18 +0100
Subject: [PATCH 27/38] EN-7354 backoffice manual send_matching

---
 .../admin/entourages_controller.rb            | 15 +++++++--
 app/models/concerns/matchable.rb              |  4 +++
 app/models/matching.rb                        | 14 ++++++++
 app/services/push_notification_trigger.rb     |  7 +++-
 .../admin/entourages/send_matching.js.erb     |  4 +++
 ..._show_matching_inapp_notification.html.erb |  5 +++
 .../entourages/show/_show_matchings.html.erb  |  6 ++++
 config/routes.rb                              |  1 +
 spec/factories/matchings.rb                   |  6 ++++
 spec/models/action_spec.rb                    | 33 +++++++++++++++++++
 10 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 app/views/admin/entourages/send_matching.js.erb
 create mode 100644 app/views/admin/entourages/show/_show_matching_inapp_notification.html.erb
 create mode 100644 spec/factories/matchings.rb
 create mode 100644 spec/models/action_spec.rb

diff --git a/app/controllers/admin/entourages_controller.rb b/app/controllers/admin/entourages_controller.rb
index df4af4d98..4bcda7993 100644
--- a/app/controllers/admin/entourages_controller.rb
+++ b/app/controllers/admin/entourages_controller.rb
@@ -2,7 +2,7 @@ module Admin
   class EntouragesController < Admin::BaseController
     EXPORT_PERIOD = 1.month
 
-    before_action :set_entourage, only: [:show, :edit, :update, :close, :renew, :cancellation, :cancel, :edit_image, :update_image, :moderator_read, :moderator_unread, :message, :show_members, :show_joins, :show_invitations, :show_messages, :show_comments, :show_neighborhoods, :show_matchings, :show_siblings, :sensitive_words, :sensitive_words_check, :edit_type, :edit_owner, :update_owner, :update_neighborhoods]
+    before_action :set_entourage, only: [:show, :edit, :update, :close, :renew, :cancellation, :cancel, :edit_image, :update_image, :moderator_read, :moderator_unread, :message, :show_members, :show_joins, :show_invitations, :show_messages, :show_comments, :show_neighborhoods, :show_matchings, :show_siblings, :send_matching, :sensitive_words, :sensitive_words_check, :edit_type, :edit_owner, :update_owner, :update_neighborhoods]
     before_action :set_forced_join_request, only: [:message]
 
     before_action :set_default_index_params, only: [:index]
@@ -164,7 +164,7 @@ def show_neighborhoods
 
     def show_matchings
       @action = Action.find(params[:id])
-      @matchings = @action.matchings
+      @matchings = @action.matchings_with_notifications
 
       render :show
     end
@@ -176,6 +176,17 @@ def show_siblings
       render :show
     end
 
+    def send_matching
+      @matching = Matching.find(params[:matching_id])
+      @matching.inapp_notification_exists = @matching.inapp_notification_exists?(@matching.instance.user)
+
+      PushNotificationTrigger.new(@matching, :forced_create, Hash.new).run
+
+      respond_to do |format|
+        format.js
+      end
+    end
+
     def download_list_export
       entourage_ids = filtered_entourages.result.where(%((
         (group_type = 'outing' and metadata->>'starts_at' >= :starts_after) or
diff --git a/app/models/concerns/matchable.rb b/app/models/concerns/matchable.rb
index 9db754c74..05459dd0b 100644
--- a/app/models/concerns/matchable.rb
+++ b/app/models/concerns/matchable.rb
@@ -9,6 +9,10 @@ module Matchable
     has_many :matches, through: :matchings, source: :match
   end
 
+  def matchings_with_notifications
+    matchings.with_notifications_for_user(user)
+  end
+
   def build_openai_request(attributes = {})
     super(attributes.merge(instance_class: self.class.name))
   end
diff --git a/app/models/matching.rb b/app/models/matching.rb
index e6a7c4eae..cf1c4bc55 100644
--- a/app/models/matching.rb
+++ b/app/models/matching.rb
@@ -1,4 +1,18 @@
 class Matching < ApplicationRecord
   belongs_to :instance, polymorphic: true
   belongs_to :match, polymorphic: true
+
+  attr_accessor :inapp_notification_exists
+
+  scope :with_notifications_for_user, -> (user) {
+    joins("LEFT JOIN inapp_notifications ON inapp_notifications.instance = matchings.instance_type AND inapp_notifications.instance_id = matchings.instance_id AND inapp_notifications.user_id = #{user.id}")
+      .select(
+        'matchings.*',
+        'CASE WHEN inapp_notifications.id IS NOT NULL THEN true ELSE false END AS inapp_notification_exists'
+      )
+  }
+
+  def inapp_notification_exists? user
+    InappNotification.exists?(user: user, instance: instance_type, instance_id: instance_id, context: :matching)
+  end
 end
diff --git a/app/services/push_notification_trigger.rb b/app/services/push_notification_trigger.rb
index fbe694d6a..47885976f 100644
--- a/app/services/push_notification_trigger.rb
+++ b/app/services/push_notification_trigger.rb
@@ -543,7 +543,12 @@ def survey_response_on_create
   end
 
   def matching_on_create
-    return unless @record.position == 0
+    return unless @record.position <= 1
+
+    matching_on_forced_create
+  end
+
+  def matching_on_forced_create
     return unless instance = @record.instance
     return unless match = @record.match
     return unless moderator_id = ModerationServices.moderator_for_user(instance.user)&.id || match&.user_id
diff --git a/app/views/admin/entourages/send_matching.js.erb b/app/views/admin/entourages/send_matching.js.erb
new file mode 100644
index 000000000..3c100064d
--- /dev/null
+++ b/app/views/admin/entourages/send_matching.js.erb
@@ -0,0 +1,4 @@
+$("#matching-<%= @matching.id %> .inapp-notification").html("<%= j render(
+  partial: "admin/entourages/show/show_matching_inapp_notification",
+  locals: { matching: @matching }
+) %>");
diff --git a/app/views/admin/entourages/show/_show_matching_inapp_notification.html.erb b/app/views/admin/entourages/show/_show_matching_inapp_notification.html.erb
new file mode 100644
index 000000000..1f5fce1a3
--- /dev/null
+++ b/app/views/admin/entourages/show/_show_matching_inapp_notification.html.erb
@@ -0,0 +1,5 @@
+<% if matching.inapp_notification_exists %>
+  <span class="label label-success">Reçue</span>
+<% else %>
+  <span class="label label-danger">Non reçue</span>
+<% end %>
diff --git a/app/views/admin/entourages/show/_show_matchings.html.erb b/app/views/admin/entourages/show/_show_matchings.html.erb
index c99081a0c..7e858ba2c 100644
--- a/app/views/admin/entourages/show/_show_matchings.html.erb
+++ b/app/views/admin/entourages/show/_show_matchings.html.erb
@@ -19,6 +19,8 @@
         <th>position</th>
         <th>explanation</th>
         <th>created_at</th>
+        <th>notif inapp envoyée</th>
+        <th>Envoyer</th>
       </tr>
     </thead>
 
@@ -38,6 +40,10 @@
           <td><%= matching.position %></td>
           <td><%= matching.explanation %></td>
           <td><%= l matching.created_at.to_date, format: :long %></td>
+          <td class="inapp-notification">
+            <%= render partial: 'admin/entourages/show/show_matching_inapp_notification', :locals => { matching: matching } %>
+          </td>
+          <td><%= link_to "Envoyer", send_matching_admin_entourage_path(@entourage, matching_id: matching.id), method: :post, remote: true, class: "btn btn-default btn-sm", data: { confirm: "Etes-vous sûr de vouloir générer une notification pour l'utilisateur ?" } %></td>
         </tr>
       <% end %>
     </tbody>
diff --git a/config/routes.rb b/config/routes.rb
index a48268741..64d54a6d4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -129,6 +129,7 @@
           get 'comments/:message_id' => :show_comments, as: :show_comments
           get :show_matchings
           get :show_siblings
+          post :send_matching
           post :stop_recurrences
           get :sensitive_words
           post :sensitive_words_check
diff --git a/spec/factories/matchings.rb b/spec/factories/matchings.rb
new file mode 100644
index 000000000..0bee36c8d
--- /dev/null
+++ b/spec/factories/matchings.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :matching do
+    instance { association :contribution }
+    match { association :resource }
+  end
+end
diff --git a/spec/models/action_spec.rb b/spec/models/action_spec.rb
new file mode 100644
index 000000000..cca7a7572
--- /dev/null
+++ b/spec/models/action_spec.rb
@@ -0,0 +1,33 @@
+require 'rails_helper'
+
+RSpec.describe Action, type: :model do
+  let(:user) { create(:user) }
+  let(:action) { create(:contribution, user: user) }
+  let(:match) { create(:resource) }
+  let(:other_match) { create(:resource) }
+
+  let!(:matching_with_notification) { create(:matching, instance: action, match: match) }
+  let!(:matching_without_notification) { create(:matching, instance: action, match: other_match) }
+
+  let!(:inapp_notification) { create(:inapp_notification, user: user, instance: :resource, instance_id: match.id, context: :matching) }
+
+  describe '#matchings_with_notifications' do
+    subject { action.matchings_with_notifications }
+
+    it 'returns matchings with inapp_notification_exists set to true when notification exists' do
+      result = subject.find { |m| m.id == matching_with_notification.id }
+      expect(result.inapp_notification_exists).to be_truthy
+    end
+
+    it 'returns matchings with inapp_notification_exists set to false when no notification exists' do
+      result = subject.find { |m| m.id == matching_without_notification.id }
+      expect(result.inapp_notification_exists).to be_falsey
+    end
+
+    it 'does not raise errors when no matchings exist' do
+      action.matchings.destroy_all
+      expect { subject }.not_to raise_error
+      expect(subject).to be_empty
+    end
+  end
+end

From 9a2aade46903910b1ad22522a44c280363c2d023 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Tue, 3 Dec 2024 12:55:31 +0100
Subject: [PATCH 28/38] EN-7354 define inapp_notifications.instance_baseclass
 to allow joins with other tables

---
 .../admin/entourages_controller.rb            |   2 +-
 app/models/inapp_notification.rb              |  10 +-
 app/models/matching.rb                        |  18 ++-
 ...d_instance_class_to_inapp_notifications.rb |   5 +
 ...lize_inapp_notifications_instance_class.rb |  15 ++
 db/schema.rb                                  | 128 +++++-------------
 spec/factories/inapp_notifications.rb         |   7 +
 spec/models/action_spec.rb                    |  18 ++-
 8 files changed, 100 insertions(+), 103 deletions(-)
 create mode 100644 db/migrate/20241203113100_add_instance_class_to_inapp_notifications.rb
 create mode 100644 db/migrate/20241203113101_initialize_inapp_notifications_instance_class.rb

diff --git a/app/controllers/admin/entourages_controller.rb b/app/controllers/admin/entourages_controller.rb
index 4bcda7993..fb3c20350 100644
--- a/app/controllers/admin/entourages_controller.rb
+++ b/app/controllers/admin/entourages_controller.rb
@@ -178,7 +178,7 @@ def show_siblings
 
     def send_matching
       @matching = Matching.find(params[:matching_id])
-      @matching.inapp_notification_exists = @matching.inapp_notification_exists?(@matching.instance.user)
+      @matching.inapp_notification_exists_virtual = @matching.inapp_notification_exists?(@matching.instance.user)
 
       PushNotificationTrigger.new(@matching, :forced_create, Hash.new).run
 
diff --git a/app/models/inapp_notification.rb b/app/models/inapp_notification.rb
index 1a06ba820..b30ede63a 100644
--- a/app/models/inapp_notification.rb
+++ b/app/models/inapp_notification.rb
@@ -1,5 +1,5 @@
 class InappNotification < ApplicationRecord
-  INSTANCES = [:neighborhood, :outing, :contribution, :solicitation, :user, :neighborhood_post, :outing_post]
+  INSTANCES = [:neighborhood, :outing, :contribution, :solicitation, :user, :neighborhood_post, :outing_post, :resource]
 
   belongs_to :user # user that is notified
   belongs_to :sender, class_name: :User, required: false # user that created the notification
@@ -25,6 +25,14 @@ class InappNotification < ApplicationRecord
     where(context: context)
   }
 
+  def instance= instance
+    self.instance_baseclass = instance.to_s.camelize
+    self.instance_baseclass = "ChatMessage" if [:neighborhood_post, :outing_post].include?(instance&.to_sym)
+    self.instance_baseclass = "Entourage" if [:contribution, :solicitation, :outing].include?(instance&.to_sym)
+
+    super(instance)
+  end
+
   def record
     return unless instance
     return post if post?
diff --git a/app/models/matching.rb b/app/models/matching.rb
index cf1c4bc55..3dfb7abf5 100644
--- a/app/models/matching.rb
+++ b/app/models/matching.rb
@@ -2,17 +2,29 @@ class Matching < ApplicationRecord
   belongs_to :instance, polymorphic: true
   belongs_to :match, polymorphic: true
 
-  attr_accessor :inapp_notification_exists
+  attr_accessor :inapp_notification_exists_virtual
 
   scope :with_notifications_for_user, -> (user) {
-    joins("LEFT JOIN inapp_notifications ON inapp_notifications.instance = matchings.instance_type AND inapp_notifications.instance_id = matchings.instance_id AND inapp_notifications.user_id = #{user.id}")
+    joins(%(
+      LEFT JOIN inapp_notifications ON
+        (inapp_notifications.context = 'matching_on_create' OR inapp_notifications.context = 'matching_on_forced_create') AND
+        inapp_notifications.instance_baseclass = matchings.match_type AND
+        inapp_notifications.instance_id = matchings.match_id AND
+        inapp_notifications.user_id = #{user.id}
+      ))
       .select(
         'matchings.*',
         'CASE WHEN inapp_notifications.id IS NOT NULL THEN true ELSE false END AS inapp_notification_exists'
       )
   }
 
+  def inapp_notification_exists
+    return @inapp_notification_exists_virtual unless @inapp_notification_exists_virtual.nil?
+
+    read_attribute(:inapp_notification_exists)
+  end
+
   def inapp_notification_exists? user
-    InappNotification.exists?(user: user, instance: instance_type, instance_id: instance_id, context: :matching)
+    InappNotification.exists?(user: user, instance_baseclass: instance_type, instance_id: instance_id, context: :matching)
   end
 end
diff --git a/db/migrate/20241203113100_add_instance_class_to_inapp_notifications.rb b/db/migrate/20241203113100_add_instance_class_to_inapp_notifications.rb
new file mode 100644
index 000000000..97a460934
--- /dev/null
+++ b/db/migrate/20241203113100_add_instance_class_to_inapp_notifications.rb
@@ -0,0 +1,5 @@
+class AddInstanceClassToInappNotifications < ActiveRecord::Migration[6.1]
+  def change
+    add_column :inapp_notifications, :instance_baseclass, :string, default: "Entourage"
+  end
+end
diff --git a/db/migrate/20241203113101_initialize_inapp_notifications_instance_class.rb b/db/migrate/20241203113101_initialize_inapp_notifications_instance_class.rb
new file mode 100644
index 000000000..24bdd590c
--- /dev/null
+++ b/db/migrate/20241203113101_initialize_inapp_notifications_instance_class.rb
@@ -0,0 +1,15 @@
+class InitializeInappNotificationsInstanceClass < ActiveRecord::Migration[6.1]
+  def up
+    execute <<-SQL.squish
+      UPDATE inapp_notifications
+      SET instance_baseclass = case
+        when instance = 'outing' then 'Entourage'
+        when instance = 'contribution' then 'Entourage'
+        when instance = 'solicitation' then 'Entourage'
+        when instance = 'neighborhood_post' then 'ChatMessage'
+        when instance = 'outing_post' then 'ChatMessage'
+        else initcap(instance)
+      end
+    SQL
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 19a9d5709..5bddf069c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -13,22 +13,19 @@
 ActiveRecord::Schema.define(version: 202401111415004) do
 
   # These are extensions that must be enabled in order to support this database
-  enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
   enable_extension "postgis"
   enable_extension "unaccent"
-  enable_extension "uuid-ossp"
 
-  create_table "active_admin_comments", id: false, force: :cascade do |t|
-    t.serial "id", null: false
-    t.string "namespace", limit: 255
+  create_table "active_admin_comments", id: :serial, force: :cascade do |t|
+    t.string "namespace"
     t.text "body"
-    t.string "resource_id", limit: 255, null: false
-    t.string "resource_type", limit: 255, null: false
+    t.string "resource_id", null: false
+    t.string "resource_type", null: false
+    t.string "author_type"
     t.integer "author_id"
-    t.string "author_type", limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
     t.index ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id"
@@ -49,30 +46,9 @@
     t.integer "user_id", null: false
     t.integer "position", default: 1, null: false
     t.string "city"
-    t.string "street_number", default: "null"
-    t.string "route", default: "null"
-    t.string "addressable_type", default: "null"
-    t.integer "addressable_id"
     t.index ["user_id", "position"], name: "index_addresses_on_user_id_and_position", unique: true
   end
 
-  create_table "admin_users", id: :serial, force: :cascade do |t|
-    t.string "email", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
-    t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
-    t.string "current_sign_in_ip"
-    t.string "last_sign_in_ip"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.index ["email"], name: "index_admin_users_on_email", unique: true
-    t.index ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true
-  end
-
   create_table "announcements", id: :serial, force: :cascade do |t|
     t.string "title"
     t.string "body"
@@ -99,7 +75,7 @@
   create_table "categories", id: :serial, force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string "name", limit: 255
+    t.string "name"
   end
 
   create_table "categories_pois", id: false, force: :cascade do |t|
@@ -123,10 +99,10 @@
     t.string "status", default: "active"
     t.integer "deleter_id"
     t.datetime "deleted_at"
-    t.string "uuid_v2", limit: 15, null: false
-    t.json "options", default: {}
+    t.string "uuid_v2", limit: 12, null: false
     t.integer "survey_id"
     t.integer "comments_count", default: 0
+    t.jsonb "options"
     t.index "((metadata ->> 'conversation_message_broadcast_id'::text))", name: "index_chat_messages_on_conversation_broadcast_id"
     t.index ["ancestry"], name: "index_chat_messages_on_ancestry"
     t.index ["created_at"], name: "index_chat_messages_on_created_at"
@@ -135,7 +111,6 @@
     t.index ["status"], name: "index_chat_messages_on_status"
     t.index ["survey_id"], name: "index_chat_messages_on_survey_id"
     t.index ["user_id"], name: "index_chat_messages_on_user_id"
-    t.index ["uuid_v2"], name: "index_chat_messages_on_uuid_v2", unique: true
   end
 
   create_table "contact_subscriptions", force: :cascade do |t|
@@ -338,6 +313,7 @@
     t.string "description"
     t.uuid "uuid"
     t.string "category"
+    t.boolean "use_suggestions", default: false, null: false
     t.string "display_category"
     t.string "uuid_v2", limit: 71, null: false
     t.string "postal_code", limit: 8
@@ -358,7 +334,6 @@
     t.integer "number_of_confirmed_people", default: 0
     t.boolean "auto_post_at_create", default: false
     t.integer "number_of_root_chat_messages", default: 0
-    t.index "((metadata ->> 'ends_at'::text)), ((metadata ->> 'starts_at'::text))", name: "entourages_metadata_idx"
     t.index "((metadata ->> 'ends_at'::text)), ((metadata ->> 'starts_at'::text))", name: "index_entourages_metadata_dates"
     t.index "st_setsrid(st_makepoint(longitude, latitude), 4326)", name: "index_entourages_on_coordinates", using: :gist
     t.index ["country", "postal_code"], name: "index_entourages_on_country_and_postal_code"
@@ -401,22 +376,6 @@
     t.index ["user_id", "partner_id"], name: "index_followings_on_user_id_and_partner_id", unique: true
   end
 
-  create_table "fp_denorm_daily_engagements", id: false, force: :cascade do |t|
-    t.date "date", null: false
-    t.integer "user_id", null: false
-    t.string "postal_code", limit: 8
-    t.index ["date", "user_id", "postal_code"], name: "fp_denorm_daily_engagements_date_idx", unique: true
-  end
-
-  create_table "fp_image_resize_actions", id: false, force: :cascade do |t|
-    t.string "bucket"
-    t.string "path"
-    t.string "destPath"
-    t.string "destSize"
-    t.datetime "created_at"
-    t.string "status"
-  end
-
   create_table "image_resize_actions", force: :cascade do |t|
     t.string "bucket", null: false
     t.string "path", null: false
@@ -442,7 +401,7 @@
     t.integer "post_id"
     t.integer "sender_id"
     t.string "title"
-    t.string "instance_class", default: "Entourage"
+    t.string "instance_baseclass", default: "Entourage"
     t.index ["user_id"], name: "index_inapp_notifications_on_user_id"
   end
 
@@ -469,19 +428,6 @@
     t.index ["user_id"], name: "index_join_requests_on_user_id"
   end
 
-  create_table "lexical_transformations", force: :cascade do |t|
-    t.string "instance_type"
-    t.integer "instance_id"
-    t.jsonb "name"
-    t.jsonb "description"
-    t.boolean "performed", default: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.index ["description"], name: "index_lexical_transformations_on_description", using: :gin
-    t.index ["instance_type", "instance_id"], name: "index_lexical_transformations_on_instance_type_and_instance_id", unique: true
-    t.index ["name"], name: "index_lexical_transformations_on_name", using: :gin
-  end
-
   create_table "login_histories", id: :serial, force: :cascade do |t|
     t.integer "user_id", null: false
     t.datetime "connected_at", null: false
@@ -519,7 +465,6 @@
   create_table "moderation_areas", id: :serial, force: :cascade do |t|
     t.string "departement", limit: 2, null: false
     t.string "name", null: false
-    t.integer "moderator_id"
     t.string "slack_channel", limit: 80
     t.text "welcome_message_1_offer_help"
     t.text "welcome_message_2_offer_help"
@@ -530,9 +475,9 @@
     t.text "welcome_message_1_goal_not_known"
     t.text "welcome_message_2_goal_not_known"
     t.string "slack_moderator_id_old"
-    t.boolean "activity", default: false, null: false
     t.integer "animator_id"
     t.integer "sourcing_id"
+    t.boolean "activity", default: false, null: false
     t.integer "community_builder_id"
     t.index ["departement"], name: "index_moderation_areas_on_departement", unique: true
   end
@@ -599,7 +544,7 @@
   end
 
   create_table "newsletter_subscriptions", id: :serial, force: :cascade do |t|
-    t.string "email", limit: 255
+    t.string "email"
     t.boolean "active"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -643,10 +588,10 @@
     t.integer "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string "street_person_name", limit: 255
+    t.string "street_person_name"
     t.float "latitude"
     t.float "longitude"
-    t.string "voice_message_url", limit: 255
+    t.string "voice_message_url"
     t.integer "tour_id"
     t.string "encrypted_message"
     t.string "address"
@@ -741,7 +686,6 @@
     t.integer "number_of_people", default: 0, null: false
     t.float "latitude"
     t.float "longitude"
-    t.datetime "feed_updated_at"
     t.index "st_setsrid(st_makepoint(longitude, latitude), 4326)", name: "index_tours_on_coordinates", using: :gist
     t.index ["latitude", "longitude"], name: "index_tours_on_latitude_and_longitude"
     t.index ["user_id", "updated_at", "tour_type"], name: "index_tours_on_user_id_and_updated_at_and_tour_type"
@@ -857,16 +801,16 @@
   end
 
   create_table "pois", id: :serial, force: :cascade do |t|
-    t.string "name", limit: 255
+    t.string "name"
     t.text "description"
     t.float "latitude"
     t.float "longitude"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string "adress", limit: 255
-    t.string "phone", limit: 255
+    t.string "adress"
+    t.string "phone"
     t.string "website"
-    t.string "email", limit: 512
+    t.string "email"
     t.string "audience"
     t.integer "category_id"
     t.boolean "validated", default: false, null: false
@@ -877,7 +821,6 @@
     t.string "hours"
     t.string "languages"
     t.string "postal_code"
-    t.boolean "internal", default: false
     t.index ["category_id", "latitude", "longitude"], name: "index_pois_on_category_id_and_latitude_and_longitude", where: "validated"
     t.index ["latitude", "longitude"], name: "index_pois_on_latitude_and_longitude"
     t.index ["partner_id"], name: "index_pois_on_partner_id", unique: true
@@ -889,6 +832,7 @@
   create_table "reactions", force: :cascade do |t|
     t.string "name"
     t.string "key"
+    t.string "image_url"
     t.integer "position", default: 0
   end
 
@@ -948,14 +892,14 @@
     t.index ["uuid_v2"], name: "index_resources_on_uuid_v2", unique: true
   end
 
-  create_table "rpush_apps", id: :serial, force: :cascade do |t|
+  create_table "rpush_apps", force: :cascade do |t|
     t.string "name", null: false
     t.string "environment"
     t.text "certificate"
     t.string "password"
     t.integer "connections", default: 1, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.string "type", null: false
     t.string "auth_key"
     t.string "client_id"
@@ -971,16 +915,16 @@
     t.text "json_key"
   end
 
-  create_table "rpush_feedback", id: :serial, force: :cascade do |t|
+  create_table "rpush_feedback", force: :cascade do |t|
     t.string "device_token"
     t.datetime "failed_at", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.integer "app_id"
     t.index ["device_token"], name: "index_rpush_feedback_on_device_token"
   end
 
-  create_table "rpush_notifications", id: :serial, force: :cascade do |t|
+  create_table "rpush_notifications", force: :cascade do |t|
     t.integer "badge"
     t.string "device_token"
     t.string "sound"
@@ -994,8 +938,8 @@
     t.integer "error_code"
     t.text "error_description"
     t.datetime "deliver_after"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.boolean "alert_is_json", default: false, null: false
     t.string "type", null: false
     t.string "collapse_key"
@@ -1039,15 +983,15 @@
 
   create_table "sensitive_words_checks", id: :serial, force: :cascade do |t|
     t.string "status", null: false
-    t.integer "record_id", null: false
     t.string "record_type", null: false
+    t.integer "record_id", null: false
     t.text "matches", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["record_type", "record_id"], name: "index_sensitive_words_checks_on_record_type_and_record_id", unique: true
   end
 
-  create_table "session_histories", id: :serial, force: :cascade do |t|
+  create_table "session_histories", id: false, force: :cascade do |t|
     t.integer "user_id", null: false
     t.date "date", null: false
     t.string "platform", limit: 7, null: false
@@ -1158,7 +1102,6 @@
   create_table "user_blocked_users", force: :cascade do |t|
     t.integer "user_id", null: false
     t.integer "blocked_user_id", null: false
-    t.string "status", default: "blocked", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["blocked_user_id"], name: "index_user_blocked_users_on_blocked_user_id"
@@ -1245,11 +1188,11 @@
   create_table "users", id: :serial, force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string "email", limit: 255
-    t.string "first_name", limit: 255
-    t.string "last_name", limit: 255
+    t.string "email"
+    t.string "first_name"
+    t.string "last_name"
     t.string "phone", null: false
-    t.string "token", limit: 255
+    t.string "token"
     t.string "device_id"
     t.integer "device_type"
     t.string "sms_code"
@@ -1265,6 +1208,7 @@
     t.integer "marketing_referer_id", default: 1, null: false
     t.datetime "last_sign_in_at"
     t.boolean "old_atd_friend", default: false, null: false
+    t.boolean "use_suggestions", default: false, null: false
     t.string "about", limit: 200
     t.string "community", limit: 9, null: false
     t.string "encrypted_password"
@@ -1278,7 +1222,7 @@
     t.integer "partner_id"
     t.boolean "partner_admin", default: false, null: false
     t.string "partner_role_title"
-    t.uuid "uuid", default: -> { "public.gen_random_uuid()" }
+    t.uuid "uuid", default: -> { "gen_random_uuid()" }, null: false
     t.string "goal"
     t.jsonb "interests_old", default: [], null: false
     t.string "encrypted_admin_password"
diff --git a/spec/factories/inapp_notifications.rb b/spec/factories/inapp_notifications.rb
index a71e8b996..83bdf975f 100644
--- a/spec/factories/inapp_notifications.rb
+++ b/spec/factories/inapp_notifications.rb
@@ -5,6 +5,13 @@
     instance_id { association(:neighborhood).id }
     context { :chat_message_on_create }
 
+    after(:build) do |notification, evaluator|
+      if evaluator.instance.present?
+        notification.instance = evaluator.instance
+        notification.instance_id = evaluator.instance_id
+      end
+    end
+
     trait :obsolete do
       created_at { Time.now - InappNotificationServices::Builder::OBSOLETE_PERIOD - 1.hour }
     end
diff --git a/spec/models/action_spec.rb b/spec/models/action_spec.rb
index cca7a7572..b9c980690 100644
--- a/spec/models/action_spec.rb
+++ b/spec/models/action_spec.rb
@@ -3,13 +3,15 @@
 RSpec.describe Action, type: :model do
   let(:user) { create(:user) }
   let(:action) { create(:contribution, user: user) }
-  let(:match) { create(:resource) }
+  let!(:match) { create(:resource) }
   let(:other_match) { create(:resource) }
 
   let!(:matching_with_notification) { create(:matching, instance: action, match: match) }
   let!(:matching_without_notification) { create(:matching, instance: action, match: other_match) }
 
-  let!(:inapp_notification) { create(:inapp_notification, user: user, instance: :resource, instance_id: match.id, context: :matching) }
+  let!(:inapp_notification) {
+    create(:inapp_notification, user: user, instance: :resource, instance_id: match.id, context: :matching_on_create)
+  }
 
   describe '#matchings_with_notifications' do
     subject { action.matchings_with_notifications }
@@ -24,10 +26,14 @@
       expect(result.inapp_notification_exists).to be_falsey
     end
 
-    it 'does not raise errors when no matchings exist' do
-      action.matchings.destroy_all
-      expect { subject }.not_to raise_error
-      expect(subject).to be_empty
+    context "without matchings" do
+      let(:matching_with_notification) { nil }
+      let(:matching_without_notification) { nil }
+
+      it 'does not raise errors when no matchings exist' do
+        expect { subject }.not_to raise_error
+        expect(subject.to_a).to be_empty
+      end
     end
   end
 end

From f19706cb645555555b1dd93a41c8f22588d37966 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Tue, 3 Dec 2024 13:37:30 +0100
Subject: [PATCH 29/38] EN-7354 fix matching display

---
 app/controllers/admin/entourages_controller.rb           | 3 ++-
 app/models/matching.rb                                   | 2 +-
 app/views/admin/entourages/show/_show_matchings.html.erb | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/entourages_controller.rb b/app/controllers/admin/entourages_controller.rb
index fb3c20350..037af9e64 100644
--- a/app/controllers/admin/entourages_controller.rb
+++ b/app/controllers/admin/entourages_controller.rb
@@ -178,10 +178,11 @@ def show_siblings
 
     def send_matching
       @matching = Matching.find(params[:matching_id])
-      @matching.inapp_notification_exists_virtual = @matching.inapp_notification_exists?(@matching.instance.user)
 
       PushNotificationTrigger.new(@matching, :forced_create, Hash.new).run
 
+      @matching.inapp_notification_exists_virtual = @matching.inapp_notification_exists?(@matching.instance.user)
+
       respond_to do |format|
         format.js
       end
diff --git a/app/models/matching.rb b/app/models/matching.rb
index 3dfb7abf5..561ac567f 100644
--- a/app/models/matching.rb
+++ b/app/models/matching.rb
@@ -25,6 +25,6 @@ def inapp_notification_exists
   end
 
   def inapp_notification_exists? user
-    InappNotification.exists?(user: user, instance_baseclass: instance_type, instance_id: instance_id, context: :matching)
+    InappNotification.exists?(user: user, instance_baseclass: match_type, instance_id: match_id, context: [:matching_on_create, :matching_on_forced_create])
   end
 end
diff --git a/app/views/admin/entourages/show/_show_matchings.html.erb b/app/views/admin/entourages/show/_show_matchings.html.erb
index 7e858ba2c..e80c95d75 100644
--- a/app/views/admin/entourages/show/_show_matchings.html.erb
+++ b/app/views/admin/entourages/show/_show_matchings.html.erb
@@ -26,7 +26,7 @@
 
     <tbody>
       <% @matchings.each do |matching| %>
-        <tr>
+        <tr id="matching-<%= matching.id %>">
           <td><%= matching.match_type %></td>
           <td><%= link_to matching.match.name, [:admin, matching.match] %></td>
           <td>

From c504c1f8b1d00ec1a7f961f2ee9b828fd05c57b2 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Tue, 3 Dec 2024 14:48:31 +0100
Subject: [PATCH 30/38] EN-7354 display inapp_notification.created_at

---
 app/controllers/admin/entourages_controller.rb  |  4 +++-
 app/models/matching.rb                          | 17 +++++++----------
 .../_show_matching_inapp_notification.html.erb  |  4 ++--
 spec/models/action_spec.rb                      | 10 +++++-----
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/controllers/admin/entourages_controller.rb b/app/controllers/admin/entourages_controller.rb
index 037af9e64..72913091d 100644
--- a/app/controllers/admin/entourages_controller.rb
+++ b/app/controllers/admin/entourages_controller.rb
@@ -165,6 +165,8 @@ def show_neighborhoods
     def show_matchings
       @action = Action.find(params[:id])
       @matchings = @action.matchings_with_notifications
+        .select("matchings.*, max(inapp_notifications.created_at) AS inapp_notification_created_at")
+        .group("matchings.id")
 
       render :show
     end
@@ -181,7 +183,7 @@ def send_matching
 
       PushNotificationTrigger.new(@matching, :forced_create, Hash.new).run
 
-      @matching.inapp_notification_exists_virtual = @matching.inapp_notification_exists?(@matching.instance.user)
+      @matching.inapp_notification_created_at_virtual = @matching.inapp_notifications.pluck(:created_at).compact.max
 
       respond_to do |format|
         format.js
diff --git a/app/models/matching.rb b/app/models/matching.rb
index 561ac567f..880cecbee 100644
--- a/app/models/matching.rb
+++ b/app/models/matching.rb
@@ -2,7 +2,7 @@ class Matching < ApplicationRecord
   belongs_to :instance, polymorphic: true
   belongs_to :match, polymorphic: true
 
-  attr_accessor :inapp_notification_exists_virtual
+  attr_accessor :inapp_notification_created_at_virtual
 
   scope :with_notifications_for_user, -> (user) {
     joins(%(
@@ -11,20 +11,17 @@ class Matching < ApplicationRecord
         inapp_notifications.instance_baseclass = matchings.match_type AND
         inapp_notifications.instance_id = matchings.match_id AND
         inapp_notifications.user_id = #{user.id}
-      ))
-      .select(
-        'matchings.*',
-        'CASE WHEN inapp_notifications.id IS NOT NULL THEN true ELSE false END AS inapp_notification_exists'
       )
+    )
   }
 
-  def inapp_notification_exists
-    return @inapp_notification_exists_virtual unless @inapp_notification_exists_virtual.nil?
+  def inapp_notification_created_at
+    return @inapp_notification_created_at_virtual unless @inapp_notification_created_at_virtual.nil?
 
-    read_attribute(:inapp_notification_exists)
+    read_attribute(:inapp_notification_created_at)
   end
 
-  def inapp_notification_exists? user
-    InappNotification.exists?(user: user, instance_baseclass: match_type, instance_id: match_id, context: [:matching_on_create, :matching_on_forced_create])
+  def inapp_notifications
+    InappNotification.where(user: instance.user, instance_baseclass: match_type, instance_id: match_id, context: [:matching_on_create, :matching_on_forced_create])
   end
 end
diff --git a/app/views/admin/entourages/show/_show_matching_inapp_notification.html.erb b/app/views/admin/entourages/show/_show_matching_inapp_notification.html.erb
index 1f5fce1a3..e6fa67f72 100644
--- a/app/views/admin/entourages/show/_show_matching_inapp_notification.html.erb
+++ b/app/views/admin/entourages/show/_show_matching_inapp_notification.html.erb
@@ -1,5 +1,5 @@
-<% if matching.inapp_notification_exists %>
-  <span class="label label-success">Reçue</span>
+<% if matching.inapp_notification_created_at %>
+  <span class="label label-success">Reçue le <%= l matching.inapp_notification_created_at.to_date %></span>
 <% else %>
   <span class="label label-danger">Non reçue</span>
 <% end %>
diff --git a/spec/models/action_spec.rb b/spec/models/action_spec.rb
index b9c980690..82cde0eb6 100644
--- a/spec/models/action_spec.rb
+++ b/spec/models/action_spec.rb
@@ -14,16 +14,16 @@
   }
 
   describe '#matchings_with_notifications' do
-    subject { action.matchings_with_notifications }
+    subject { action.matchings_with_notifications.select("matchings.*, inapp_notifications.id as inapp_notification_id") }
 
-    it 'returns matchings with inapp_notification_exists set to true when notification exists' do
+    it 'returns matchings with inapp_notification_id set to true when notification exists' do
       result = subject.find { |m| m.id == matching_with_notification.id }
-      expect(result.inapp_notification_exists).to be_truthy
+      expect(result.inapp_notification_id).to be_truthy
     end
 
-    it 'returns matchings with inapp_notification_exists set to false when no notification exists' do
+    it 'returns matchings with inapp_notification_id set to false when no notification exists' do
       result = subject.find { |m| m.id == matching_without_notification.id }
-      expect(result.inapp_notification_exists).to be_falsey
+      expect(result.inapp_notification_id).to be_falsey
     end
 
     context "without matchings" do

From ab5d6cd2da4c115a8740ce1a4a575a604a42387e Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Wed, 4 Dec 2024 10:35:18 +0100
Subject: [PATCH 31/38] EN-7354 remove deprecated version of matcher service

---
 app/services/entourage_services/matcher.rb    | 169 ------------------
 .../entourage_services/matcher_spec.rb        |  39 ----
 2 files changed, 208 deletions(-)
 delete mode 100644 app/services/entourage_services/matcher.rb
 delete mode 100644 spec/services/entourage_services/matcher_spec.rb

diff --git a/app/services/entourage_services/matcher.rb b/app/services/entourage_services/matcher.rb
deleted file mode 100644
index 05e13ec1f..000000000
--- a/app/services/entourage_services/matcher.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-module EntourageServices
-  class Matcher
-    PER = 25
-
-    attr_reader :callback, :instance, :user
-
-    class MatcherCallback < Callback
-    end
-
-    def initialize instance:
-      @callback = MatcherCallback.new
-      @instance = instance
-      @user = instance.user
-    end
-
-    def find_best_matches
-      yield callback if block_given?
-
-      matches = Client.new.find(instance: instance, contents: find_close_to_instance)
-
-      return callback.on_failure.try(:call, "No matches found") unless matches["success"]
-
-      callback.on_success.try(:call, matches)
-    rescue => e
-      callback.on_failure.try(:call, e.message)
-    end
-
-    def find_close_to_instance
-      latitude = instance.latitude
-      longitude = instance.longitude
-
-      {
-        contributions: ActiveModel::Serializer::CollectionSerializer.new(
-          get_contributions,
-          serializer: ::V1::Matchings::ActionSerializer,
-          scope: { latitude: latitude, longitude: longitude }
-        ),
-        solicitations: ActiveModel::Serializer::CollectionSerializer.new(
-          get_solicitations,
-          serializer: ::V1::Matchings::ActionSerializer,
-          scope: { latitude: latitude, longitude: longitude }
-        ),
-        outings: ActiveModel::Serializer::CollectionSerializer.new(
-          get_outings,
-          serializer: ::V1::Matchings::OutingSerializer,
-          scope: { latitude: latitude, longitude: longitude }
-        ),
-        resources: ActiveModel::Serializer::CollectionSerializer.new(
-          get_resources,
-          serializer: ::V1::Matchings::ResourceSerializer
-        ),
-        pois: ActiveModel::Serializer::CollectionSerializer.new(
-          get_pois,
-          serializer: ::V1::Matchings::PoiSerializer,
-          scope: { latitude: latitude, longitude: longitude }
-        )
-      }
-    end
-
-    def get_contributions
-      ContributionServices::Finder.new(user, Hash.new).find_all.limit(PER)
-    end
-
-    def get_solicitations
-      SolicitationServices::Finder.new(user, Hash.new).find_all.limit(PER)
-    end
-
-    def get_outings
-      OutingsServices::Finder.new(user, Hash.new).find_all.limit(PER)
-    end
-
-    def get_resources
-      Resource.where(status: :active)
-    end
-
-    def get_pois
-      Poi.validated.around(instance.latitude, instance.longitude, user.travel_distance).limit(PER)
-    end
-
-    def self.parse_matching matching
-      return unless matching.is_a?(Hash)
-      return unless matching.key?("id")
-      return unless matching.key?("type")
-
-      klass = matching["type"].classify.constantize
-
-      return klass.find_by_id_or_uuid(matching["id"]) if klass.respond_to?(:find_by_id_or_uuid)
-
-      klass.find_by_id(matching["id"])
-    end
-  end
-
-  class Client
-    attr_reader :client, :assistant_id
-
-    def initialize
-      @client = OpenAI::Client.new(access_token: ENV['OPENAI_API_KEY'])
-      @assistant_id = ENV['OPENAI_API_ASSISTANT_ID']
-    end
-
-    def find instance:, contents: []
-      # create new thread
-      thread = client.threads.create
-
-      # create instance message
-      message = client.messages.create(thread_id: thread['id'], parameters: {
-        role: "assistant",
-        content: {
-          instance: {
-            name: instance.name,
-            description: instance.description,
-            uuid: instance.uuid_v2
-          },
-          contents: contents
-        }.to_json
-      })
-
-      # run the thread
-      run = client.runs.create(thread_id: thread['id'], parameters: {
-        assistant_id: assistant_id,
-        max_prompt_tokens: 1024,
-        max_completion_tokens: 256
-      })
-
-      # wait for completion
-      status_loop(thread['id'], run['id'])
-
-      # find the message
-      return { success: false } unless result = find_run_message(thread['id'], run['id'])
-      return { success: false } unless result['success']
-
-      result.merge({
-        "assistant_id" => assistant_id,
-        "thread_id" => thread['id'],
-        "run_id" => run['id'],
-      })
-    end
-
-    def status_loop thread_id, run_id
-      while true do
-        response = client.runs.retrieve(id: run_id, thread_id: thread_id)
-        status = response['status']
-
-        break if ['completed'].include?(status) # success
-        break if ['cancelled', 'failed', 'expired'].include?(status) # error
-        break if ['incomplete'].include?(status) # ???
-
-        sleep 1 if ['queued', 'in_progress', 'cancelling'].include?(status)
-      end
-    end
-
-    def find_run_message thread_id, run_id
-      run_steps = client.run_steps.list(thread_id: thread_id, run_id: run_id, parameters: { order: 'asc' })
-
-      new_message_ids = run_steps['data'].filter_map { |step|
-        if step['type'] == 'message_creation'
-          step.dig('step_details', "message_creation", "message_id")
-        end
-      }
-
-      return unless new_message_ids.any?
-      return unless message = client.messages.retrieve(id: new_message_ids.first, thread_id: thread_id)
-
-      JSON.parse(message['content'].first['text']['value']).merge({
-        "message_id" => new_message_ids.first
-      })
-    end
-  end
-end
diff --git a/spec/services/entourage_services/matcher_spec.rb b/spec/services/entourage_services/matcher_spec.rb
deleted file mode 100644
index 10aa25afa..000000000
--- a/spec/services/entourage_services/matcher_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe EntourageServices::Matcher do
-  describe 'parse_matching' do
-    let(:valid_json) do
-      { "score" => 0.95, "type" => "action", "id" => "abc_uuid_v2" }
-    end
-
-    let(:invalid_json) { nil }
-
-    it 'returns an empty array when json is nil' do
-      expect(described_class.parse_matching(invalid_json)).to be_nil
-    end
-
-    it 'returns an empty array when json does not contain keys' do
-      json_without_success = { "foo" => [] }
-      expect(described_class.parse_matching(json_without_success)).to be_nil
-    end
-
-    it 'returns an empty array when json does not contain id key' do
-      json_without_matchings = { "type" => "action" }
-      expect(described_class.parse_matching(json_without_matchings)).to be_nil
-    end
-
-    it 'returns an empty array when json does not contain type key' do
-      json_without_matchings = { "id" => "abc_uuid_v2" }
-      expect(described_class.parse_matching(json_without_matchings)).to be_nil
-    end
-
-    it 'returns a list of matched objects when json is valid' do
-      solicitation_double = double('Solicitation')
-      
-      expect(Action).to receive(:find_by_id_or_uuid).with('abc_uuid_v2').and_return(solicitation_double)
-
-      result = described_class.parse_matching(valid_json)
-      expect(result).to eq(solicitation_double)
-    end
-  end
-end

From 02b35003c5a186915b7da219ae4f990e12aeb2e9 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Tue, 10 Dec 2024 16:15:32 +0100
Subject: [PATCH 32/38] EN-7354 fix when no match

---
 app/views/admin/actions/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/actions/index.html.erb b/app/views/admin/actions/index.html.erb
index 152e4787e..9e42cb2eb 100644
--- a/app/views/admin/actions/index.html.erb
+++ b/app/views/admin/actions/index.html.erb
@@ -48,7 +48,7 @@
               <td>
                 <% action.matchings.each do |matching| %>
                   <p>
-                    <%= "#{matching.match.name} : score #{matching.score} (#{matching.match_type} : #{matching.explanation})" %>
+                    <%= "#{matching.match&.name} : score #{matching.score} (#{matching.match_type} : #{matching.explanation})" %>
                   </p>
                 <% end %>
               </td>

From 91c328ac65a0b18d52eae38430c13bee76da2e6e Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Wed, 11 Dec 2024 16:22:03 +0100
Subject: [PATCH 33/38] EN-7354 backoffice for openai_requests: add response to
 visualize

---
 app/controllers/admin/actions_controller.rb   |  2 +-
 .../admin/openai_requests_controller.rb       | 28 ++++++++
 app/jobs/openai_request_job.rb                |  5 +-
 app/models/openai_request.rb                  | 28 ++++++++
 app/services/matching_services/connect.rb     |  4 +-
 app/views/admin/actions/index.html.erb        |  6 ++
 .../admin/openai_requests/index.html.erb      | 29 ++++++++
 app/views/admin/openai_requests/show.html.erb | 72 +++++++++++++++++++
 config/routes.rb                              |  1 +
 ...1144500_add_response_to_openai_requests.rb |  5 ++
 db/schema.rb                                  |  1 +
 11 files changed, 176 insertions(+), 5 deletions(-)
 create mode 100644 app/controllers/admin/openai_requests_controller.rb
 create mode 100644 app/views/admin/openai_requests/index.html.erb
 create mode 100644 app/views/admin/openai_requests/show.html.erb
 create mode 100644 db/migrate/20241211144500_add_response_to_openai_requests.rb

diff --git a/app/controllers/admin/actions_controller.rb b/app/controllers/admin/actions_controller.rb
index c3cbbfceb..4fb004472 100644
--- a/app/controllers/admin/actions_controller.rb
+++ b/app/controllers/admin/actions_controller.rb
@@ -6,7 +6,7 @@ def index
       @params = params.permit([:area, :search]).to_h
       @area = params[:area].presence&.to_sym || :all
 
-      @actions = Action.includes([:user, matchings: :match])
+      @actions = Action.includes([:user, :openai_request, matchings: :match])
       @actions = @actions.search_by(params[:search]) if params[:search].present?
       @actions = @actions.with_moderation_area(@area.to_s) if @area && @area != :all
       @actions = @actions.page(page).per(per)
diff --git a/app/controllers/admin/openai_requests_controller.rb b/app/controllers/admin/openai_requests_controller.rb
new file mode 100644
index 000000000..3dcb3f03a
--- /dev/null
+++ b/app/controllers/admin/openai_requests_controller.rb
@@ -0,0 +1,28 @@
+module Admin
+  class OpenaiRequestsController < Admin::BaseController
+    layout 'admin_large'
+
+    before_action :set_openai_request, only: [:show]
+
+    def index
+      @openai_requests = OpenaiRequest.page(page).per(per)
+    end
+
+    def show
+    end
+
+    private
+
+    def set_openai_request
+      @openai_request = OpenaiRequest.find(params[:id])
+    end
+
+    def page
+      params[:page] || 1
+    end
+
+    def per
+      params[:per] || 25
+    end
+  end
+end
diff --git a/app/jobs/openai_request_job.rb b/app/jobs/openai_request_job.rb
index 14a425a06..a2215b6c1 100644
--- a/app/jobs/openai_request_job.rb
+++ b/app/jobs/openai_request_job.rb
@@ -17,7 +17,7 @@ def perform openai_request_id
           openai_thread_id: response.metadata[:thread_id],
           openai_run_id: response.metadata[:run_id],
           openai_message_id: response.metadata[:message_id],
-          status: nil,
+          status: :success,
           run_ends_at: Time.current,
           updated_at: Time.current
         )
@@ -29,8 +29,9 @@ def perform openai_request_id
         instance.save(validate: false)
       end
 
-      on.failure do |error|
+      on.failure do |error, response|
         openai_request.update_columns(
+          response: response,
           status: :error,
           run_ends_at: Time.current,
           updated_at: Time.current
diff --git a/app/models/openai_request.rb b/app/models/openai_request.rb
index f4c7b53c8..49a64a4e6 100644
--- a/app/models/openai_request.rb
+++ b/app/models/openai_request.rb
@@ -7,6 +7,34 @@ def instance
     instance_class.constantize.find(instance_id)
   end
 
+  def instance_baseclass
+    instance_class.constantize.base_class.find(instance_id)
+  end
+
+  def error?
+    status.to_s == "error"
+  end
+
+  def assistant_link
+    "https://platform.openai.com/playground/assistants?assistant=#{openai_assistant_id}"
+  end
+
+  def thread_link
+    "https://platform.openai.com/threads/#{openai_thread_id}"
+  end
+
+  def response_valid?
+    matching_response.valid?
+  end
+
+  def formatted_response
+    matching_response.parsed_response
+  end
+
+  def matching_response
+    @matching_response ||= MatchingServices::Response.new(response: response)
+  end
+
   attr_accessor :forced_matching
 
   def run
diff --git a/app/services/matching_services/connect.rb b/app/services/matching_services/connect.rb
index e8b8fb856..5facbc9ab 100644
--- a/app/services/matching_services/connect.rb
+++ b/app/services/matching_services/connect.rb
@@ -40,11 +40,11 @@ def perform
 
       response = Response.new(response: find_run_message(thread['id'], run['id']))
 
-      return callback.on_failure.try(:call, "Response not valid") unless response.valid?
+      return callback.on_failure.try(:call, "Response not valid", response) unless response.valid?
 
       callback.on_success.try(:call, response)
     rescue => e
-      callback.on_failure.try(:call, e.message)
+      callback.on_failure.try(:call, e.message, nil)
     end
 
     private
diff --git a/app/views/admin/actions/index.html.erb b/app/views/admin/actions/index.html.erb
index 9e42cb2eb..3fed18e38 100644
--- a/app/views/admin/actions/index.html.erb
+++ b/app/views/admin/actions/index.html.erb
@@ -35,6 +35,7 @@
             <th>Date de création</th>
             <th>Statut</th>
             <th>Matchings</th>
+            <th>Matchings status</th>
           </thead>
           <% @actions.each_with_index do |action, i| %>
             <% parite = i.even? ? 'pair' : 'impair' %>
@@ -52,6 +53,11 @@
                   </p>
                 <% end %>
               </td>
+              <td>
+                <% if action.openai_request %>
+                  <%= link_to action.openai_request.status, admin_openai_request_path(action.openai_request) %>
+                <% end %>
+              </td>
             </tr>
           <% end %>
         </table>
diff --git a/app/views/admin/openai_requests/index.html.erb b/app/views/admin/openai_requests/index.html.erb
new file mode 100644
index 000000000..4e49a122c
--- /dev/null
+++ b/app/views/admin/openai_requests/index.html.erb
@@ -0,0 +1,29 @@
+<div class="container">
+  <div style="margin: auto">
+    <h1>openai_requests</h1>
+
+    <div class="row">
+      <% unless @openai_requests.none? %>
+        <table class="table custom-table">
+          <thead>
+            <th>Nom</th>
+            <th>Créé le</th>
+          </thead>
+          <% @openai_requests.each_with_index do |openai_request, i| %>
+            <% parite = i.even? ? 'pair' : 'impair' %>
+
+            <tr class="above-row row-<%= parite %>">
+              <td><%= link_to openai_request.instance.name, admin_openai_request_path(openai_request) %></td>
+              <td><%= l openai_request.created_at %></td>
+            </tr>
+          <% end %>
+        </table>
+      <% end %>
+    </div>
+
+    <%= page_entries_info @openai_requests, entry_name: 'openai_requests' %>
+    <div class="container">
+      <%= paginate(@openai_requests) %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/admin/openai_requests/show.html.erb b/app/views/admin/openai_requests/show.html.erb
new file mode 100644
index 000000000..9bb861955
--- /dev/null
+++ b/app/views/admin/openai_requests/show.html.erb
@@ -0,0 +1,72 @@
+<div class="container">
+  <div class="row">
+    <div class="col-xs-offset-2 col-xs-8">
+      <ol class="breadcrumb">
+        <li><%= link_to "OpenAI requests", admin_openai_requests_path %></li>
+        <li><%= @openai_request.instance.name %></li>
+      </ol>
+
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <%= link_to @openai_request.instance.name, [:admin, @openai_request.instance_baseclass] %>
+        </div>
+
+        <div class="panel-body">
+          <p>
+            <% if @openai_request.error? %>
+              <span class="label label-danger">error</span>
+            <% else %>
+              <span class="label label-info">success</span>
+            <% end %>
+          </p>
+
+          <p>
+            <strong>Assistant OpenAI</strong>
+            <%= link_to @openai_request.openai_assistant_id, @openai_request.assistant_link %>
+          </p>
+
+          <p>
+            <strong>Thread OpenAI</strong>
+            <%= link_to @openai_request.openai_thread_id, @openai_request.thread_link %>
+          </p>
+
+          <p>
+            <strong>Instance type</strong>
+            <%= @openai_request.instance_type %>
+          </p>
+
+          <p>
+            <strong>Instance id</strong>
+            <%= @openai_request.instance_id %>
+          </p>
+
+          <p>
+            <strong>Lancé le:</strong>
+            <%= l @openai_request.run_starts_at if @openai_request.run_starts_at %>
+          </p>
+
+          <p>
+            <strong>Fini le:</strong>
+            <%= l @openai_request.run_ends_at if @openai_request.run_ends_at %>
+          </p>
+
+          <p>
+            <strong>Validité réponse:</strong>
+            <%= @openai_request.response_valid? %>
+          </p>
+
+          <p>
+            <strong>Réponse:</strong>
+            <%= @openai_request.response %>
+          </p>
+
+          <p>
+            <strong>Réponse formattée:</strong>
+            <%= @openai_request.formatted_response %>
+          </p>
+        </div>
+      </div>
+
+    </div>
+  </div>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
index 64d54a6d4..804023b30 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -269,6 +269,7 @@
     end
 
     resources :openai_assistants, only: [:index, :edit, :update]
+    resources :openai_requests, only: [:index, :show]
 
     resources :recommandations do
       member do
diff --git a/db/migrate/20241211144500_add_response_to_openai_requests.rb b/db/migrate/20241211144500_add_response_to_openai_requests.rb
new file mode 100644
index 000000000..7ad952112
--- /dev/null
+++ b/db/migrate/20241211144500_add_response_to_openai_requests.rb
@@ -0,0 +1,5 @@
+class AddResponseToOpenaiRequests < ActiveRecord::Migration[6.1]
+  def change
+    add_column :openai_requests, :response, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5bddf069c..aea78818c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -732,6 +732,7 @@
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.string "instance_class", default: "Entourage"
+    t.string "response"
     t.index ["instance_type", "instance_id"], name: "index_openai_requests_on_instance_type_and_instance_id", unique: true
   end
 

From 44c653f4edd34ecdc4dd1c3fceabedd878b63304 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Thu, 12 Dec 2024 14:56:42 +0100
Subject: [PATCH 34/38] EN-7354 display response, formatted_response in
 backoffice

---
 app/controllers/admin/openai_requests_controller.rb          | 5 ++++-
 app/jobs/openai_request_job.rb                               | 5 ++++-
 app/models/openai_request.rb                                 | 4 +++-
 app/services/matching_services/response.rb                   | 4 ++++
 app/views/admin/openai_requests/show.html.erb                | 4 ++--
 db/migrate/20241211144500_add_response_to_openai_requests.rb | 1 +
 db/schema.rb                                                 | 1 +
 7 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/controllers/admin/openai_requests_controller.rb b/app/controllers/admin/openai_requests_controller.rb
index 3dcb3f03a..822032393 100644
--- a/app/controllers/admin/openai_requests_controller.rb
+++ b/app/controllers/admin/openai_requests_controller.rb
@@ -5,7 +5,10 @@ class OpenaiRequestsController < Admin::BaseController
     before_action :set_openai_request, only: [:show]
 
     def index
-      @openai_requests = OpenaiRequest.page(page).per(per)
+      @openai_requests = OpenaiRequest
+        .order(updated_at: :desc)
+        .page(page)
+        .per(per)
     end
 
     def show
diff --git a/app/jobs/openai_request_job.rb b/app/jobs/openai_request_job.rb
index a2215b6c1..95bbb5261 100644
--- a/app/jobs/openai_request_job.rb
+++ b/app/jobs/openai_request_job.rb
@@ -13,6 +13,8 @@ def perform openai_request_id
     MatchingServices::Connect.new(instance: instance).perform do |on|
       on.success do |response|
         openai_request.update_columns(
+          error: nil,
+          response: response.to_json,
           openai_assistant_id: response.metadata[:assistant_id],
           openai_thread_id: response.metadata[:thread_id],
           openai_run_id: response.metadata[:run_id],
@@ -31,7 +33,8 @@ def perform openai_request_id
 
       on.failure do |error, response|
         openai_request.update_columns(
-          response: response,
+          error: error,
+          response: response.to_json,
           status: :error,
           run_ends_at: Time.current,
           updated_at: Time.current
diff --git a/app/models/openai_request.rb b/app/models/openai_request.rb
index 49a64a4e6..27eda7567 100644
--- a/app/models/openai_request.rb
+++ b/app/models/openai_request.rb
@@ -32,7 +32,9 @@ def formatted_response
   end
 
   def matching_response
-    @matching_response ||= MatchingServices::Response.new(response: response)
+    @matching_response ||= MatchingServices::Response.new(response: JSON.parse(response))
+  rescue
+    @matching_response ||= MatchingServices::Response.new(response: Hash.new)
   end
 
   attr_accessor :forced_matching
diff --git a/app/services/matching_services/response.rb b/app/services/matching_services/response.rb
index eb8357798..c929232c2 100644
--- a/app/services/matching_services/response.rb
+++ b/app/services/matching_services/response.rb
@@ -33,6 +33,10 @@ def parsed_response
       JSON.parse(json)
     end
 
+    def to_json
+      @response.to_json
+    end
+
     def recommandations
       return [] unless @parsed_response
 
diff --git a/app/views/admin/openai_requests/show.html.erb b/app/views/admin/openai_requests/show.html.erb
index 9bb861955..fb03a4ca3 100644
--- a/app/views/admin/openai_requests/show.html.erb
+++ b/app/views/admin/openai_requests/show.html.erb
@@ -57,12 +57,12 @@
 
           <p>
             <strong>Réponse:</strong>
-            <%= @openai_request.response %>
+            <pre wrap="true"><%= @openai_request.response %></pre>
           </p>
 
           <p>
             <strong>Réponse formattée:</strong>
-            <%= @openai_request.formatted_response %>
+            <pre wrap="true"><%= @openai_request.formatted_response %></pre>
           </p>
         </div>
       </div>
diff --git a/db/migrate/20241211144500_add_response_to_openai_requests.rb b/db/migrate/20241211144500_add_response_to_openai_requests.rb
index 7ad952112..5e5ead3be 100644
--- a/db/migrate/20241211144500_add_response_to_openai_requests.rb
+++ b/db/migrate/20241211144500_add_response_to_openai_requests.rb
@@ -1,5 +1,6 @@
 class AddResponseToOpenaiRequests < ActiveRecord::Migration[6.1]
   def change
     add_column :openai_requests, :response, :string
+    add_column :openai_requests, :error, :string
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index aea78818c..8e8f852ce 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -733,6 +733,7 @@
     t.datetime "updated_at", precision: 6, null: false
     t.string "instance_class", default: "Entourage"
     t.string "response"
+    t.string "error"
     t.index ["instance_type", "instance_id"], name: "index_openai_requests_on_instance_type_and_instance_id", unique: true
   end
 

From a11f83fbf2890a65adcff22c2d63d181711cee48 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Thu, 12 Dec 2024 14:57:10 +0100
Subject: [PATCH 35/38] EN-7354 change prompt format and response uuid_v2 to id

---
 app/serializers/openai/resource_serializer.rb |  2 +-
 app/services/matching_services/connect.rb     | 12 +++++++-----
 app/services/matching_services/response.rb    |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/serializers/openai/resource_serializer.rb b/app/serializers/openai/resource_serializer.rb
index b7f2dbc11..2f75378b3 100644
--- a/app/serializers/openai/resource_serializer.rb
+++ b/app/serializers/openai/resource_serializer.rb
@@ -1,6 +1,6 @@
 module Openai
   class ResourceSerializer < ActiveModel::Serializer
-    attributes :uuid_v2, :name, :is_video, :description
+    attributes :id, :name, :is_video, :description
 
     def description
       object.text_description_only
diff --git a/app/services/matching_services/connect.rb b/app/services/matching_services/connect.rb
index 5facbc9ab..431986ae1 100644
--- a/app/services/matching_services/connect.rb
+++ b/app/services/matching_services/connect.rb
@@ -83,14 +83,16 @@ def user_message
     end
 
     def get_formatted_prompt
-      instance_class = if instance.respond_to?(:action) && instance.action?
-        instance.contribution? ? 'contribution' : 'solicitation'
-      else
-        instance.class.name.camelize.downcase
+      action_type = opposite_action_type = instance.class.name.camelize.downcase
+
+      if instance.respond_to?(:action) && instance.action?
+        action_type = instance.contribution? ? 'contribution' : 'solicitation'
+        opposite_action_type = instance.contribution? ? 'solicitation' : 'contribution'
       end
 
       @configuration.prompt
-        .gsub("{{action_type}}", instance_class)
+        .gsub("{{action_type}}", action_type)
+        .gsub("{{opposite_action_type}}", opposite_action_type)
         .gsub("{{name}}", instance.name)
         .gsub("{{description}}", instance.description)
     end
diff --git a/app/services/matching_services/response.rb b/app/services/matching_services/response.rb
index c929232c2..56409bb57 100644
--- a/app/services/matching_services/response.rb
+++ b/app/services/matching_services/response.rb
@@ -67,7 +67,7 @@ def each_recommandation &block
       recommandations.each_with_index do |recommandation, index|
         next unless recommandation["id"]
         next unless TYPES.include?(recommandation["type"])
-        next unless instance = recommandation["type"].classify.constantize.find_by_id_or_uuid(recommandation["id"])
+        next unless instance = recommandation["type"].classify.constantize.find_by_id(recommandation["id"])
 
         yield(instance, recommandation["score"], recommandation["explanation"], index)
       end

From 1936a9f1aaa4f04ac74633399d50f0dda61e4507 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Thu, 12 Dec 2024 16:24:50 +0100
Subject: [PATCH 36/38] EN-7354 simplify json sent to openai to avoid errors in
 interpretation

---
 app/serializers/openai/contribution_serializer.rb |  6 +++++-
 app/serializers/openai/outing_serializer.rb       |  6 +++++-
 app/serializers/openai/poi_serializer.rb          |  6 +++++-
 app/serializers/openai/resource_serializer.rb     |  6 +++++-
 app/serializers/openai/solicitation_serializer.rb |  6 +++++-
 app/services/matching_services/connect.rb         | 13 ++++++-------
 6 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/app/serializers/openai/contribution_serializer.rb b/app/serializers/openai/contribution_serializer.rb
index fc569494a..0671a5f0a 100644
--- a/app/serializers/openai/contribution_serializer.rb
+++ b/app/serializers/openai/contribution_serializer.rb
@@ -1,5 +1,9 @@
 module Openai
   class ContributionSerializer < ActiveModel::Serializer
-    attributes :id, :name, :description
+    attributes :id, :type, :name, :description
+
+    def type
+      :contribution
+    end
   end
 end
diff --git a/app/serializers/openai/outing_serializer.rb b/app/serializers/openai/outing_serializer.rb
index 0801789db..5e16983be 100644
--- a/app/serializers/openai/outing_serializer.rb
+++ b/app/serializers/openai/outing_serializer.rb
@@ -1,5 +1,9 @@
 module Openai
   class OutingSerializer < ActiveModel::Serializer
-    attributes :id, :name, :description
+    attributes :id, :type, :name, :description
+
+    def type
+      :outing
+    end
   end
 end
diff --git a/app/serializers/openai/poi_serializer.rb b/app/serializers/openai/poi_serializer.rb
index 4be3130bb..e21f4c7ee 100644
--- a/app/serializers/openai/poi_serializer.rb
+++ b/app/serializers/openai/poi_serializer.rb
@@ -1,5 +1,9 @@
 module Openai
   class PoiSerializer < ActiveModel::Serializer
-    attributes :id, :name
+    attributes :id, :type, :name
+
+    def type
+      :poi
+    end
   end
 end
diff --git a/app/serializers/openai/resource_serializer.rb b/app/serializers/openai/resource_serializer.rb
index 2f75378b3..8a54d7029 100644
--- a/app/serializers/openai/resource_serializer.rb
+++ b/app/serializers/openai/resource_serializer.rb
@@ -1,6 +1,10 @@
 module Openai
   class ResourceSerializer < ActiveModel::Serializer
-    attributes :id, :name, :is_video, :description
+    attributes :id, :type, :name, :is_video, :description
+
+    def type
+      :resource
+    end
 
     def description
       object.text_description_only
diff --git a/app/serializers/openai/solicitation_serializer.rb b/app/serializers/openai/solicitation_serializer.rb
index cfa1a8e2a..df9368e34 100644
--- a/app/serializers/openai/solicitation_serializer.rb
+++ b/app/serializers/openai/solicitation_serializer.rb
@@ -1,5 +1,9 @@
 module Openai
   class SolicitationSerializer < ActiveModel::Serializer
-    attributes :id, :name, :description
+    attributes :id, :type, :name, :description
+
+    def type
+      :solicitation
+    end
   end
 end
diff --git a/app/services/matching_services/connect.rb b/app/services/matching_services/connect.rb
index 431986ae1..02925daeb 100644
--- a/app/services/matching_services/connect.rb
+++ b/app/services/matching_services/connect.rb
@@ -99,13 +99,12 @@ def get_formatted_prompt
 
     def get_recommandations
       {
-        recommandations: {
-          contributions: get_contributions.map { |contribution| Openai::ContributionSerializer.new(contribution).as_json },
-          solicitations: get_solicitations.map { |solicitation| Openai::SolicitationSerializer.new(solicitation).as_json },
-          outings: get_outings.map { |outing| Openai::OutingSerializer.new(outing).as_json },
-          pois: get_pois.map { |poi| Openai::PoiSerializer.new(poi).as_json },
-          resources: get_resources.map { |resource| Openai::ResourceSerializer.new(resource).as_json }
-        }
+        recommandations:
+          get_contributions.map { |contribution| Openai::ContributionSerializer.new(contribution).as_json } +
+          get_solicitations.map { |solicitation| Openai::SolicitationSerializer.new(solicitation).as_json } +
+          get_outings.map { |outing| Openai::OutingSerializer.new(outing).as_json } +
+          get_pois.map { |poi| Openai::PoiSerializer.new(poi).as_json } +
+          get_resources.map { |resource| Openai::ResourceSerializer.new(resource).as_json }
       }
     end
 

From d862232113f7d7b7d04309762301a76db34e1457 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Mon, 16 Dec 2024 14:51:50 +0100
Subject: [PATCH 37/38] EN-7354 templating

---
 app/views/admin/actions/index.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/actions/index.html.erb b/app/views/admin/actions/index.html.erb
index 3fed18e38..df8955507 100644
--- a/app/views/admin/actions/index.html.erb
+++ b/app/views/admin/actions/index.html.erb
@@ -49,7 +49,8 @@
               <td>
                 <% action.matchings.each do |matching| %>
                   <p>
-                    <%= "#{matching.match&.name} : score #{matching.score} (#{matching.match_type} : #{matching.explanation})" %>
+                    <span class="custom-badge info"><%= matching.score %></span> <b><%= matching.match&.name %></b> (<%= matching.match_type %>)<br/>
+                    <%= matching.explanation %>
                   </p>
                 <% end %>
               </td>

From 6fdb10294e63b015821c371a60327fda28d29ff0 Mon Sep 17 00:00:00 2001
From: nicolas-entourage <75681929+nicolas-entourage@users.noreply.github.com>
Date: Mon, 16 Dec 2024 16:17:55 +0100
Subject: [PATCH 38/38] EN-7354 refactor: extract openai logic to a shareable
 class BasicPerformer

---
 app/jobs/openai_request_job.rb                |  2 +-
 app/models/openai_request.rb                  |  4 +-
 app/services/matching_services/client.rb      |  7 --
 .../openai_services/basic_performer.rb        | 89 +++++++++++++++++++
 .../matching_performer.rb}                    | 75 +++-------------
 .../matching_response.rb}                     |  4 +-
 .../admin/openai_assistants/_form.html.erb    | 14 +++
 ..._add_token_lengths_to_openai_assistants.rb |  6 ++
 ...01_add_module_type_to_openai_assistants.rb |  5 ++
 .../matching_response_spec.rb}                |  2 +-
 10 files changed, 132 insertions(+), 76 deletions(-)
 delete mode 100644 app/services/matching_services/client.rb
 create mode 100644 app/services/openai_services/basic_performer.rb
 rename app/services/{matching_services/connect.rb => openai_services/matching_performer.rb} (54%)
 rename app/services/{matching_services/response.rb => openai_services/matching_response.rb} (96%)
 create mode 100644 db/migrate/20241216160300_add_token_lengths_to_openai_assistants.rb
 create mode 100644 db/migrate/20241216160301_add_module_type_to_openai_assistants.rb
 rename spec/services/{matching_services/response_spec.rb => openai_services/matching_response_spec.rb} (96%)

diff --git a/app/jobs/openai_request_job.rb b/app/jobs/openai_request_job.rb
index 95bbb5261..3c5f5bbc1 100644
--- a/app/jobs/openai_request_job.rb
+++ b/app/jobs/openai_request_job.rb
@@ -10,7 +10,7 @@ def perform openai_request_id
 
     return unless instance = openai_request.instance
 
-    MatchingServices::Connect.new(instance: instance).perform do |on|
+    OpenaiServices::MatchingPerformer.new(instance: instance).perform do |on|
       on.success do |response|
         openai_request.update_columns(
           error: nil,
diff --git a/app/models/openai_request.rb b/app/models/openai_request.rb
index 27eda7567..a75f0c433 100644
--- a/app/models/openai_request.rb
+++ b/app/models/openai_request.rb
@@ -32,9 +32,9 @@ def formatted_response
   end
 
   def matching_response
-    @matching_response ||= MatchingServices::Response.new(response: JSON.parse(response))
+    @matching_response ||= OpenaiServices::MatchingResponse.new(response: JSON.parse(response))
   rescue
-    @matching_response ||= MatchingServices::Response.new(response: Hash.new)
+    @matching_response ||= OpenaiServices::MatchingResponse.new(response: Hash.new)
   end
 
   attr_accessor :forced_matching
diff --git a/app/services/matching_services/client.rb b/app/services/matching_services/client.rb
deleted file mode 100644
index 19f1b1c09..000000000
--- a/app/services/matching_services/client.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module MatchingServices
-  class Client
-    def self.session
-      OpenAI::Client.new(access_token: ENV['OPENAI_API_KEY'])
-    end
-  end
-end
diff --git a/app/services/openai_services/basic_performer.rb b/app/services/openai_services/basic_performer.rb
new file mode 100644
index 000000000..b4beb339d
--- /dev/null
+++ b/app/services/openai_services/basic_performer.rb
@@ -0,0 +1,89 @@
+module OpenaiServices
+  class BasicPerformer
+    attr_reader :configuration, :client, :callback, :assistant_id, :instance
+
+    class BasicPerformerCallback < Callback
+    end
+
+    def initialize instance:
+      @callback = BasicPerformerCallback.new
+
+      @configuration = get_configuration
+
+      @client = OpenAI::Client.new(access_token: @configuration.api_key)
+      @assistant_id = @configuration.assistant_id
+
+      @instance = instance
+    end
+
+    def perform
+      yield callback if block_given?
+
+      # create new thread
+      thread = client.threads.create
+
+      # create instance message
+      message = client.messages.create(thread_id: thread['id'], parameters: user_message)
+
+      # run the thread
+      run = client.runs.create(thread_id: thread['id'], parameters: {
+        assistant_id: assistant_id,
+        max_prompt_tokens: configuration.max_prompt_tokens,
+        max_completion_tokens: configuration.max_completion_tokens
+      })
+
+      # wait for completion
+      status = status_loop(thread['id'], run['id'])
+
+      return callback.on_failure.try(:call, "Failure status #{status}") unless ['completed', 'requires_action'].include?(status)
+
+      response = get_response_class.new(response: find_run_message(thread['id'], run['id']))
+
+      return callback.on_failure.try(:call, "Response not valid", response) unless response.valid?
+
+      callback.on_success.try(:call, response)
+    rescue => e
+      callback.on_failure.try(:call, e.message, nil)
+    end
+
+    def status_loop thread_id, run_id
+      status = nil
+
+      while true do
+        response = client.runs.retrieve(id: run_id, thread_id: thread_id)
+        status = response['status']
+
+        break if ['completed'].include?(status) # success
+        break if ['requires_action'].include?(status) # success
+        break if ['cancelled', 'failed', 'expired'].include?(status) # error
+        break if ['incomplete'].include?(status) # ???
+
+        sleep 1 if ['queued', 'in_progress', 'cancelling'].include?(status)
+      end
+
+      status
+    end
+
+    def find_run_message thread_id, run_id
+      messages = client.messages.list(thread_id: thread_id)
+      messages['data'].find { |message| message['run_id'] == run_id && message['role'] == 'assistant' }
+    end
+
+    private
+
+    # OpenaiAssistant.find_by_version(?)
+    def get_configuration
+      raise NotImplementedError, "this method get_configuration has to be defined in your class"
+    end
+
+    # format: { role: string, content: { type: "text", text: string }}
+    def user_message
+      raise NotImplementedError, "this method user_message has to be defined in your class"
+    end
+
+    # example: MatchingResponse
+    def get_response_class
+      raise NotImplementedError, "this method get_response_class has to be defined in your class"
+    end
+  end
+end
diff --git a/app/services/matching_services/connect.rb b/app/services/openai_services/matching_performer.rb
similarity index 54%
rename from app/services/matching_services/connect.rb
rename to app/services/openai_services/matching_performer.rb
index 02925daeb..a8dc2fca7 100644
--- a/app/services/matching_services/connect.rb
+++ b/app/services/openai_services/matching_performer.rb
@@ -1,75 +1,18 @@
-module MatchingServices
-  class Connect
-    attr_reader :configuration, :client, :callback, :assistant_id, :instance, :user
+module OpenaiServices
+  class MatchingPerformer < BasicPerformer
+    attr_reader :user
 
     class MatcherCallback < Callback
     end
 
     def initialize instance:
-      @callback = MatcherCallback.new
+      super(instance: instance)
 
-      @configuration = OpenaiAssistant.find_by_version(1)
-
-      @client = OpenAI::Client.new(access_token: @configuration.api_key)
-      @assistant_id = @configuration.assistant_id
-
-      @instance = instance
       @user = instance.user
     end
 
-    def perform
-      yield callback if block_given?
-
-      # create new thread
-      thread = client.threads.create
-
-      # create instance message
-      message = client.messages.create(thread_id: thread['id'], parameters: user_message)
-
-      # run the thread
-      run = client.runs.create(thread_id: thread['id'], parameters: {
-        assistant_id: assistant_id,
-        max_prompt_tokens: 1024*1024,
-        max_completion_tokens: 1024
-      })
-
-      # wait for completion
-      status = status_loop(thread['id'], run['id'])
-
-      return callback.on_failure.try(:call, "Failure status #{status}") unless ['completed', 'requires_action'].include?(status)
-
-      response = Response.new(response: find_run_message(thread['id'], run['id']))
-
-      return callback.on_failure.try(:call, "Response not valid", response) unless response.valid?
-
-      callback.on_success.try(:call, response)
-    rescue => e
-      callback.on_failure.try(:call, e.message, nil)
-    end
-
-    private
-
-    def status_loop thread_id, run_id
-      status = nil
-
-      while true do
-        response = client.runs.retrieve(id: run_id, thread_id: thread_id)
-        status = response['status']
-
-        break if ['completed'].include?(status) # success
-        break if ['requires_action'].include?(status) # success
-        break if ['cancelled', 'failed', 'expired'].include?(status) # error
-        break if ['incomplete'].include?(status) # ???
-
-        sleep 1 if ['queued', 'in_progress', 'cancelling'].include?(status)
-      end
-
-      status
-    end
-
-    def find_run_message(thread_id, run_id)
-      messages = client.messages.list(thread_id: thread_id)
-      messages['data'].find { |message| message['run_id'] == run_id && message['role'] == 'assistant' }
+    def get_configuration
+      OpenaiAssistant.find_by_module_type(:matching)
     end
 
     def user_message
@@ -82,6 +25,12 @@ def user_message
       }
     end
 
+    def get_response_class
+      MatchingResponse
+    end
+
+    private
+
     def get_formatted_prompt
       action_type = opposite_action_type = instance.class.name.camelize.downcase
 
diff --git a/app/services/matching_services/response.rb b/app/services/openai_services/matching_response.rb
similarity index 96%
rename from app/services/matching_services/response.rb
rename to app/services/openai_services/matching_response.rb
index 56409bb57..052b512a9 100644
--- a/app/services/matching_services/response.rb
+++ b/app/services/openai_services/matching_response.rb
@@ -1,4 +1,4 @@
-module MatchingServices
+module OpenaiServices
   # response example
   # {"recommandations"=>
   #   [{
@@ -10,7 +10,7 @@ module MatchingServices
   #   }]
   # }
 
-  Response = Struct.new(:response) do
+  MatchingResponse = Struct.new(:response) do
     TYPES = %w{contribution solicitation outing resource poi}
 
     def initialize(response: nil)
diff --git a/app/views/admin/openai_assistants/_form.html.erb b/app/views/admin/openai_assistants/_form.html.erb
index c7bc16258..a3ef84bb7 100644
--- a/app/views/admin/openai_assistants/_form.html.erb
+++ b/app/views/admin/openai_assistants/_form.html.erb
@@ -29,6 +29,20 @@
     </div>
   </div>
 
+  <div class="form-group">
+    <%= f.label :max_prompt_tokens %>
+    <div class="controls">
+      <%= f.number_field :max_prompt_tokens, class: "form-control", required: true %>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :max_completion_tokens %>
+    <div class="controls">
+      <%= f.number_field :max_completion_tokens, class: "form-control", required: true %>
+    </div>
+  </div>
+
   <div class="form-group">
     <%= f.label :poi_from_file, "Charger les points d'intérêt depuis un fichier ?" %>
     <div class="controls">
diff --git a/db/migrate/20241216160300_add_token_lengths_to_openai_assistants.rb b/db/migrate/20241216160300_add_token_lengths_to_openai_assistants.rb
new file mode 100644
index 000000000..11be83663
--- /dev/null
+++ b/db/migrate/20241216160300_add_token_lengths_to_openai_assistants.rb
@@ -0,0 +1,6 @@
+class AddTokenLengthsToOpenaiAssistants < ActiveRecord::Migration[6.1]
+  def change
+    add_column :openai_assistants, :max_prompt_tokens, :integer, default: 1024*1024
+    add_column :openai_assistants, :max_completion_tokens, :integer, default: 1024
+  end
+end
diff --git a/db/migrate/20241216160301_add_module_type_to_openai_assistants.rb b/db/migrate/20241216160301_add_module_type_to_openai_assistants.rb
new file mode 100644
index 000000000..1c26883eb
--- /dev/null
+++ b/db/migrate/20241216160301_add_module_type_to_openai_assistants.rb
@@ -0,0 +1,5 @@
+class AddModuleTypeToOpenaiAssistants < ActiveRecord::Migration[6.1]
+  def change
+    add_column :openai_assistants, :module_type, :string, default: :matching
+  end
+end
diff --git a/spec/services/matching_services/response_spec.rb b/spec/services/openai_services/matching_response_spec.rb
similarity index 96%
rename from spec/services/matching_services/response_spec.rb
rename to spec/services/openai_services/matching_response_spec.rb
index 78dbea7de..87b8cbaed 100644
--- a/spec/services/matching_services/response_spec.rb
+++ b/spec/services/openai_services/matching_response_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe MatchingServices::Response do
+describe OpenaiServices::MatchingResponse do
   describe '#parsed_response' do
     subject { described_class.new(response: response).parsed_response }