timingapp 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a79de69ccb24a1e5c35a69207a219f1fe55b45ed4235b9754672d0092d7810d
-  data.tar.gz: 6c231d00516bf4fa9e6469e2dc845993ad36403fddd5fa791c8981b890b4cae6
+  metadata.gz: 0bbf343e9db9ad0a5cc47973b64324a5f8f2db9c4c212c506d685bb1012ca142
+  data.tar.gz: 385f3dfb6c8b4443cae10f63980c44dfe2da09b3068f3f76795ce4ef8b6e71ae
 SHA512:
-  metadata.gz: a7534b16516f60eaa05099ce33fc7462692228d447e11dafd02cedc25f80a9ab2bfef349c1cead89c0ceab8da578c68a68bfcf4a2d4431c7915f55a23bacf24b
-  data.tar.gz: 8ed80e54333c6dcdcb8c313e36ebed9592ba35eb075b4f9c9bf121f7780a0b078c9b2a603f4c6b882bc0baacc8384300d5dc96889d822a403313fcbf303e023e
+  metadata.gz: 62e1b5c1ff904701269431b8c0b9940bf2cc03342ee1af63a0d9e3a514c236382854e6ba73831cacf130608bd27f089bb5e745dfaadea0de1b704c03e6628ec6
+  data.tar.gz: 680a1c4eba43e5d67a99d6aa74855380bbfbd1d2f3239b7b47cf95d7d861b96095b3075c9c9c18cbdf82c73a46bd118dcd3fab316e89b1d4751e9899c69b162e

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
   NewCops: enable
   SuggestExtensions: false
 
@@ -12,6 +12,10 @@ Style/StringLiteralsInInterpolation:
 Style/Documentation:
   Enabled: false
 
+Naming/PredicateName:
+  Exclude:
+    - lib/timingapp/timing_record.rb
+
 Naming/MethodName:
   Exclude:
     - lib/timingapp/models/**

data/lib/timingapp/models/app_activity.rb

@@ -5,18 +5,15 @@ module Timingapp
     self.table_name = "AppActivity"
     self.primary_key = "id"
 
-    belongs_to :application, foreign_key: "applicationID"
-    belongs_to :localDevice, foreign_key: "localDeviceID", primary_key: "localID", class_name: "Timingapp::Device"
-    belongs_to :project, foreign_key: "projectID"
-    belongs_to :title, foreign_key: "titleID"
-    belongs_to :path, foreign_key: "pathID"
+    belongs_to :device, foreign_key: :localDeviceID
+    belongs_to :application, foreign_key: :applicationID
+    belongs_to :title, foreign_key: :titleID
+    belongs_to :path, foreign_key: :pathID
+    belongs_to :project, foreign_key: :projectID
 
-    def startDate
-      Time.at(super)
-    end
+    scope :deleted, -> { where(isDeleted: true) }
 
-    def endDate
-      Time.at(super)
-    end
+    time_column :startDate
+    time_column :endDate
   end
 end

data/lib/timingapp/models/app_activity_with_strings.rb

@@ -4,5 +4,16 @@ module Timingapp
   class AppActivityWithStrings < TimingRecord
     self.table_name = "AppActivityWithStrings"
     self.primary_key = "id"
+
+    belongs_to :device, foreign_key: :localDeviceID
+    belongs_to :application, foreign_key: :applicationID
+    belongs_to :title, foreign_key: :titleID
+    belongs_to :path, foreign_key: :pathID
+    belongs_to :project, foreign_key: :projectID
+
+    scope :deleted, -> { where(isDeleted: true) }
+
+    time_column :startDate
+    time_column :endDate
   end
 end

data/lib/timingapp/models/application.rb

@@ -4,5 +4,7 @@ module Timingapp
   class Application < TimingRecord
     self.table_name = "Application"
     self.primary_key = "id"
+
+    json_column :property_bag
   end
 end

data/lib/timingapp/models/device.rb

@@ -3,6 +3,8 @@
 module Timingapp
   class Device < TimingRecord
     self.table_name = "Device"
-    self.primary_key = "id"
+    self.primary_key = "localID"
+
+    json_column :property_bag
   end
 end

data/lib/timingapp/models/event.rb

@@ -4,5 +4,16 @@ module Timingapp
   class Event < TimingRecord
     self.table_name = "Event"
     self.primary_key = "id"
+
+    belongs_to :integration, foreign_key: :integration_id
+    belongs_to :event_source, foreign_key: :event_source_id
+
+    json_column :property_bag
+
+    time_column :start_date
+    time_column :end_date
+    time_column :last_modified_origin
+    time_column :last_modified_timing
+    time_column :deleted_at
   end
 end

data/lib/timingapp/models/event_source.rb

@@ -4,5 +4,20 @@ module Timingapp
   class EventSource < TimingRecord
     self.table_name = "EventSource"
     self.primary_key = "id"
+
+    belongs_to :integration, foreign_key: :integration_id
+    belongs_to :integration_project, foreign_key: :integration_project_id
+    belongs_to :template, foreign_key: :template_id
+
+    scope :templates, -> { where(is_template: true) }
+    scope :favorites, -> { where(is_favorite: true) }
+
+    time_column :last_modified_origin
+    time_column :last_modified_timing
+    time_column :created_by_integration_at
+    time_column :deleted_by_integration_at
+    time_column :hidden_at
+
+    json_column :property_bag
   end
 end

data/lib/timingapp/models/event_source_task_activity.rb

@@ -4,5 +4,16 @@ module Timingapp
   class EventSourceTaskActivity < TimingRecord
     self.table_name = "EventSourceTaskActivity"
     self.primary_key = "id"
+
+    belongs_to :integration, foreign_key: :integration_id
+    belongs_to :event_source, foreign_key: :event_source_id
+    belongs_to :task_activity, foreign_key: :task_activity_id
+    belongs_to :event, foreign_key: :event_id
+
+    scope :deleted, -> { where.not(deleted_at: nil) }
+
+    time_column :deleted_at
+
+    json_column :property_bag
   end
 end

data/lib/timingapp/models/filter.rb

@@ -4,5 +4,9 @@ module Timingapp
   class Filter < TimingRecord
     self.table_name = "Filter"
     self.primary_key = "id"
+
+    has_parent
+
+    scope :samples, -> { where(isSample: true) }
   end
 end

data/lib/timingapp/models/integration.rb

@@ -4,5 +4,14 @@ module Timingapp
   class Integration < TimingRecord
     self.table_name = "Integration"
     self.primary_key = "id"
+    self.inheritance_column = nil
+
+    time_column :enabled_at
+    time_column :paused_at
+    time_column :deleted_at
+    time_column :last_modified_origin
+    time_column :last_modified_timing
+
+    json_column :property_bag
   end
 end

data/lib/timingapp/models/integration_log_result.rb

@@ -2,7 +2,11 @@
 
 module Timingapp
   class IntegrationLogResult < TimingRecord
-    self.table_name = "IntegrationLogResult"
+    self.table_name = "integration_log_result"
     self.primary_key = "id"
+
+    belongs_to :integration, foreign_key: :integration_id
+
+    time_column :timestamp
   end
 end

data/lib/timingapp/models/integration_project.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Timingapp
+  class IntegrationProject < TimingRecord
+    self.table_name = "IntegrationProject"
+    self.primary_key = "id"
+
+    belongs_to :integration, foreign_key: :integration_id
+    belongs_to :timing_project, foreign_key: :timing_project_id
+
+    time_column :last_modified_origin
+    time_column :last_modified_timing
+    time_column :deleted_by_integration_at
+    time_column :hidden_at
+
+    json_column :property_bag
+  end
+end

data/lib/timingapp/models/project.rb

@@ -4,5 +4,13 @@ module Timingapp
   class Project < TimingRecord
     self.table_name = "Project"
     self.primary_key = "id"
+
+    has_parent
+
+    belongs_to :membership, foreign_key: :membershipID, class_name: "TODO"
+
+    scope :archived, -> { where(isArchived: true) }
+
+    json_column :property_bag
   end
 end

data/lib/timingapp/models/task_activity.rb

@@ -4,5 +4,15 @@ module Timingapp
   class TaskActivity < TimingRecord
     self.table_name = "TaskActivity"
     self.primary_key = "id"
+
+    belongs_to :project, foreign_key: :projectID
+
+    scope :running, -> { where(isRunning: true) }
+    scope :deleted, -> { where(isDeleted: true) }
+
+    json_column :property_bag
+
+    time_column :startDate
+    time_column :endDate
   end
 end

data/lib/timingapp/timing_record.rb

@@ -11,5 +11,33 @@ module Timingapp
     def before_destroy
       raise ActiveRecord::ReadOnlyRecord, "Cannot delete a read-only record"
     end
+
+    def self.has_parent(foreign_key = :parentID)
+      belongs_to :parent, foreign_key: foreign_key, class_name: name
+    end
+
+    def self.json_column(column)
+      define_method(column) do |*args, &block|
+        value = super(*args, &block)
+
+        begin
+          JSON.parse(value)
+        rescue JSON::ParserError, TypeError
+          value
+        end
+      end
+    end
+
+    def self.time_column(column)
+      define_method(column) do |*args, &block|
+        value = super(*args, &block)
+
+        begin
+          Time.at(value)
+        rescue TypeError
+          value
+        end
+      end
+    end
   end
 end

data/lib/timingapp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Timingapp
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/schema.rb

@@ -85,88 +85,3 @@ ActiveRecord::Schema[8.0].define(version: 202_301_121_209) do
   add_foreign_key "Project", "Project", column: "parentID", on_update: :cascade
   add_foreign_key "TaskActivity", "Project", column: "projectID", on_update: :cascade
 end
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# This file is the source Rails uses to define your schema when running `bin/rails
-# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
-# be faster and is potentially less error prone than running all of your
-# migrations from scratch. Old migrations may fail to apply correctly if those
-# migrations use external dependencies or application code.
-#
-# It's strongly recommended that you check this file into your version control system.
-
-ActiveRecord::Schema[8.0].define(version: 202_301_121_209) do
-  # Could not dump table "AppActivity" because of following StandardError
-  #   Unknown type 'REAL' for column 'startDate'
-
-  create_table "Application", force: :cascade do |t|
-    t.text "bundleIdentifier"
-    t.text "executable"
-    t.text "title"
-    t.text "property_bag"
-    t.index %w[bundleIdentifier executable title], name: "index_application_on_bundleidentifier_executable_title"
-  end
-
-  create_table "Device", primary_key: "localID", force: :cascade do |t|
-    t.integer "globalID", null: false
-    t.binary "macAddress"
-    t.text "displayName"
-    t.text "property_bag"
-  end
-
-  # Could not dump table "Event" because of following StandardError
-  #   Unknown type 'REAL' for column 'start_date'
-
-  # Could not dump table "EventSource" because of following StandardError
-  #   Unknown type 'BOOL' for column 'is_template'
-
-  # Could not dump table "EventSourceTaskActivity" because of following StandardError
-  #   Unknown type 'REAL' for column 'deleted_at'
-
-  create_table "Filter", force: :cascade do |t|
-    t.integer "parentID"
-    t.integer "listPosition", null: false
-    t.text "title", null: false
-    t.binary "predicate"
-    t.boolean "isSample", default: false, null: false
-    t.text "property_bag"
-    t.index %w[parentID listPosition], name: "index_filter_on_parentid_listposition"
-  end
-
-  # Could not dump table "Integration" because of following StandardError
-  #   Unknown type 'REAL' for column 'enabled_at'
-
-  # Could not dump table "IntegrationProject" because of following StandardError
-  #   Unknown type 'REAL' for column 'last_modified_origin'
-
-  create_table "Path", force: :cascade do |t|
-    t.text "stringValue", null: false
-  end
-
-  # Could not dump table "Project" because of following StandardError
-  #   Unknown type 'REAL' for column 'productivityScore'
-
-  # Could not dump table "TaskActivity" because of following StandardError
-  #   Unknown type 'REAL' for column 'startDate'
-
-  create_table "Title", force: :cascade do |t|
-    t.text "stringValue", null: false
-  end
-
-  # Could not dump table "integration_log_result" because of following StandardError
-  #   Unknown type 'REAL' for column 'timestamp'
-
-  add_foreign_key "AppActivity", "Application", column: "applicationID"
-  add_foreign_key "AppActivity", "Device", column: "localDeviceID", primary_key: "localID"
-  add_foreign_key "AppActivity", "Path", column: "pathID"
-  add_foreign_key "AppActivity", "Project", column: "projectID", on_update: :cascade
-  add_foreign_key "AppActivity", "Title", column: "titleID"
-  add_foreign_key "Event", "Integration", column: "integration_id"
-  add_foreign_key "EventSource", "Integration", column: "integration_id"
-  add_foreign_key "Filter", "Filter", column: "parentID", on_update: :cascade
-  add_foreign_key "IntegrationProject", "Integration", column: "integration_id"
-  add_foreign_key "Project", "Project", column: "parentID", on_update: :cascade
-  add_foreign_key "TaskActivity", "Project", column: "projectID", on_update: :cascade
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timingapp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Marco Roth
@@ -76,6 +76,7 @@ files:
 - lib/timingapp/models/filter.rb
 - lib/timingapp/models/integration.rb
 - lib/timingapp/models/integration_log_result.rb
+- lib/timingapp/models/integration_project.rb
 - lib/timingapp/models/path.rb
 - lib/timingapp/models/project.rb
 - lib/timingapp/models/schema_migration.rb
@@ -99,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="