atomic_admin 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ca58b2501bafbae9605155fe9fbc60def35e065f06bbaa05921d90e71ab1399
-  data.tar.gz: 309e2af4e8b7a79586d37bb0a207e7aaa16fd0b5cbae48a6f1eba366ab18f5a3
+  metadata.gz: 4a60af477fc58d9334de687508e1eb0ef56f2bef8ec96e5fabd726133e0934b2
+  data.tar.gz: f17e627608ebc01b5b9281cff0af01ebf17d10d06cd4db62744d833fc4b790e9
 SHA512:
-  metadata.gz: 9b5250cd2e773ceb388a0dfd5e265da0aef0b0a4ff6bbb3fb8e2154b2f912d4291c756ef09ccd3343daf66c2de4f0031c6983a69bb19af1ca87f4b809d06e88e
-  data.tar.gz: 8e6ced79806c556deb89ee88df263f4f43b12bd4524e0a8afe376cf917475e6ce94da03f9b13da50afc8a44164b330d0ff074e1ab1a1eee83fb45e40868d4a1b
+  metadata.gz: 1ca007af30664fd22c363cff5a2e76b8bf818928d9100a9b43af07dcf1ac18a93034d0ec3f89107226ac9e1755e0ec055167f0680d607b0f4bc0eadbeaaa96fb
+  data.tar.gz: f15c1ea152ef5869f3465a1a47bb36dfa7685808cffad13989c42b34d1e8368a984116cf00d5d703202ee4c671a73bd80afbe4fd526a1925b4b78cc57e5237c3

data/app/controllers/atomic_admin/v1/application_instances_controller.rb

@@ -15,6 +15,7 @@ module AtomicAdmin::V1
         end
 
       @application_instances, meta = filter(@application_instances)
+      @stats = get_stats_for_instances(@application_instances)
 
       render json: {
         application_instances: json_for_collection(@application_instances),
@@ -24,12 +25,14 @@ module AtomicAdmin::V1
 
     def show
       @application_instance = ApplicationInstance.find(params[:id])
+      @stats = get_stats_for_instances([@application_instance])
       render json: { application_instance: json_for(@application_instance) }
     end
 
     def create
       application = Application.find(params[:application_id])
       instance = application.application_instances.new(create_params)
+      @stats = get_stats_for_instances([instance])
 
       if instance.save
         render json: { application_instance: json_for(instance) }
@@ -41,6 +44,7 @@ module AtomicAdmin::V1
     def update
       instance = ApplicationInstance.find(params[:id])
       instance.update(update_params)
+      @stats = get_stats_for_instances([instance])
 
       if params[:application_instance][:is_paid] && instance.paid_at.nil?
         instance.paid_at = DateTime.now
@@ -67,6 +71,27 @@ module AtomicAdmin::V1
       render json: { interactions: interactions }
     end
 
+    def get_stats_for_instances(instances)
+      tenants = instances.pluck(:tenant)
+      stats = {}
+      stats[:errors] = RequestStatistic.total_errors_grouped(tenants) if defined?(RequestStatistic)
+      stats[:unique_users] = CachedUniqueUsersByContractDate.unique_users_by_contract_date(instances) if defined?(CachedUniqueUsersByContractDate)
+      stats[:max_users_month] = CachedUniqueUsersByMonth.max_monthly_unique_users(instances) if defined?(CachedUniqueUsersByMonth)
+
+      stats
+    end
+
+    def request_stats(instance)
+      tenant = instance.tenant
+
+      {
+        unique_users_in_contract: @stats.dig(:unique_users, tenant) || 0,
+        day_1_errors: @stats.dig(:errors, 0, tenant) || 0,
+        day_7_errors: @stats.dig(:errors, 7, tenant) || 0,
+        max_users_month: @stats.dig(:max_users_month, tenant) || 0,
+      }
+    end
+
     def json_for(instance)
       json = instance.as_json(include: [:application, :site])
 
@@ -74,8 +99,10 @@ module AtomicAdmin::V1
       json["trial_end_date"] = instance.trial_end_date&.strftime("%Y-%m-%d") if instance.respond_to?(:trial_end_date)
       json["license_start_date"] = instance.license_start_date&.strftime("%Y-%m-%d") if instance.respond_to?(:license_start_date)
       json["license_end_date"] = instance.license_end_date&.strftime("%Y-%m-%d") if instance.respond_to?(:license_end_date)
+      json["paid_at"] = instance.paid_at&.strftime("%Y-%m-%d") if instance.respond_to?(:paid_at)
       json["is_paid"] = instance.paid_at.present? if instance.respond_to?(:paid_at)
       json["lti_config_xml"] = instance.lti_config_xml if instance.respond_to?(:lti_config_xml)
+      json["request_stats"] = request_stats(instance)
 
       json
     end

data/lib/atomic_admin/schema/application_instance_license_details_schema.rb

@@ -10,7 +10,7 @@ module AtomicAdmin::Schema
             type: "boolean",
             title: "Paid Account"
           },
-          license_start_date: {
+          paid_at: {
             type: ["string", "null"],
             format: "date",
           },
@@ -57,10 +57,12 @@ module AtomicAdmin::Schema
               {
                 type: "Control",
                 scope: "#/properties/is_paid",
+
               },
               {
                 type: "Control",
-                scope: "#/properties/license_start_date",
+                scope: "#/properties/paid_at",
+                label: "License Start Date",
                 options: {
                   format: "date",
                 },

data/lib/atomic_admin/version.rb

@@ -1,3 +1,3 @@
 module AtomicAdmin
-  VERSION = "2.0.1".freeze
+  VERSION = "2.1.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atomic_admin
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Nick Benoit
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-02 00:00:00.000000000 Z
+date: 2026-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,7 +40,7 @@ dependencies:
         version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: atomic_tenant
   requirement: !ruby/object:Gem::Requirement