Taken: ${new Date(photo.localDateTime).toLocaleString()}
Location: ${photo.exifInfo.city}, ${photo.exifInfo.state}, ${photo.exifInfo.country}
- ${photo.type === 'VIDEO' ? '🎥 Video' : '📷 Photo'} + ${photo.type === 'video' ? '🎥 Video' : '📷 Photo'} `; marker.bindPopup(popupContent); diff --git a/app/javascript/controllers/trips_controller.js b/app/javascript/controllers/trips_controller.js index 00a2b497..497fe5e3 100644 --- a/app/javascript/controllers/trips_controller.js +++ b/app/javascript/controllers/trips_controller.js @@ -80,10 +80,10 @@ export default class extends Controller { this.map.on('overlayadd', (e) => { if (e.name !== 'Photos') return; - if (!this.userSettings.immich_url || !this.userSettings.immich_api_key) { + if ((!this.userSettings.immich_url || !this.userSettings.immich_api_key) && (!this.userSettings.photoprism_url || !this.userSettings.photoprism_api_key)) { showFlashMessage( 'error', - 'Immich integration is not configured. Please check your settings.' + 'Photos integration is not configured. Please check your integrations settings.' ); return; } diff --git a/app/javascript/maps/helpers.js b/app/javascript/maps/helpers.js index 9103f122..7fdcdbca 100644 --- a/app/javascript/maps/helpers.js +++ b/app/javascript/maps/helpers.js @@ -162,7 +162,7 @@ export async function fetchAndDisplayPhotos({ map, photoMarkers, apiKey, startDa const response = await fetch(`/api/v1/photos?${params}`); if (!response.ok) { - throw new Error(`HTTP error! status: ${response.status}`); + throw new Error(`HTTP error! status: ${response.status}, response: ${response.body}`); } const photos = await response.json(); @@ -171,10 +171,10 @@ export async function fetchAndDisplayPhotos({ map, photoMarkers, apiKey, startDa const photoLoadPromises = photos.map(photo => { return new Promise((resolve) => { const img = new Image(); - const thumbnailUrl = `/api/v1/photos/${photo.id}/thumbnail.jpg?api_key=${apiKey}`; + const thumbnailUrl = `/api/v1/photos/${photo.id}/thumbnail.jpg?api_key=${apiKey}&source=${photo.source}`; img.onload = () => { - createPhotoMarker(photo, userSettings.immich_url, photoMarkers, apiKey); + createPhotoMarker(photo, userSettings, photoMarkers, apiKey); resolve(); }; @@ -216,11 +216,44 @@ export async function fetchAndDisplayPhotos({ map, photoMarkers, apiKey, startDa } } +function getPhotoLink(photo, userSettings) { + switch (photo.source) { + case 'immich': + const startOfDay = new Date(photo.localDateTime); + startOfDay.setHours(0, 0, 0, 0); -export function createPhotoMarker(photo, immichUrl, photoMarkers,apiKey) { - if (!photo.exifInfo?.latitude || !photo.exifInfo?.longitude) return; + const endOfDay = new Date(photo.localDateTime); + endOfDay.setHours(23, 59, 59, 999); - const thumbnailUrl = `/api/v1/photos/${photo.id}/thumbnail.jpg?api_key=${apiKey}`; + const queryParams = { + takenAfter: startOfDay.toISOString(), + takenBefore: endOfDay.toISOString() + }; + const encodedQuery = encodeURIComponent(JSON.stringify(queryParams)); + + return `${userSettings.immich_url}/search?query=${encodedQuery}`; + case 'photoprism': + return `${userSettings.photoprism_url}/library/browse?view=cards&year=${photo.localDateTime.split('-')[0]}&month=${photo.localDateTime.split('-')[1]}&order=newest&public=true&quality=3`; + default: + return '#'; // Default or error case + } +} + +function getSourceUrl(photo, userSettings) { + switch (photo.source) { + case 'photoprism': + return userSettings.photoprism_url; + case 'immich': + return userSettings.immich_url; + default: + return '#'; // Default or error case + } +} + +export function createPhotoMarker(photo, userSettings, photoMarkers, apiKey) { + if (!photo.latitude || !photo.longitude) return; + + const thumbnailUrl = `/api/v1/photos/${photo.id}/thumbnail.jpg?api_key=${apiKey}&source=${photo.source}`; const icon = L.divIcon({ className: 'photo-marker', @@ -229,25 +262,16 @@ export function createPhotoMarker(photo, immichUrl, photoMarkers,apiKey) { }); const marker = L.marker( - [photo.exifInfo.latitude, photo.exifInfo.longitude], + [photo.latitude, photo.longitude], { icon } ); - const startOfDay = new Date(photo.localDateTime); - startOfDay.setHours(0, 0, 0, 0); + const photo_link = getPhotoLink(photo, userSettings); + const source_url = getSourceUrl(photo, userSettings); - const endOfDay = new Date(photo.localDateTime); - endOfDay.setHours(23, 59, 59, 999); - - const queryParams = { - takenAfter: startOfDay.toISOString(), - takenBefore: endOfDay.toISOString() - }; - const encodedQuery = encodeURIComponent(JSON.stringify(queryParams)); - const immich_photo_link = `${immichUrl}/search?query=${encodedQuery}`; const popupContent = `Taken: ${new Date(photo.localDateTime).toLocaleString()}
-Location: ${photo.exifInfo.city}, ${photo.exifInfo.state}, ${photo.exifInfo.country}
+Location: ${photo.city}, ${photo.state}, ${photo.country}
+Source: ${photo.source}
${photo.type === 'VIDEO' ? '🎥 Video' : '📷 Photo'}With the release 0.19.2, Dawarich now can collect usage some metrics and send them to InfluxDB.
+Before this release, the only metrics that could be somehow tracked by developers (only Freika, as of now) were the number of stars on GitHub and the overall number of docker images being pulled, across all versions of Dawarich, non-splittable by version. New in-app telemetry will allow us to track more granular metrics, allowing me to make decisions based on facts, not just guesses.
+I'm aware about the privacy concerns, so I want to be very transparent about what data is being sent and how it's used.
+Data being sent:
+The data is being sent to a InfluxDB instance hosted by me and won't be shared with anyone.
+Basically this set of metrics allows me to see how many people are using Dawarich and what versions they are using. No other data is being sent, nor it gives me any knowledge about individual users or their data or activity.
+The telemetry is enabled by default, but it can be disabled by setting DISABLE_TELEMETRY env var to true. The dataset might change in the future, but any changes will be documented here in the changelog and in every release as well as on the telemetry page of the website docs.
You can read more about it in the release page.
+ CONTENT + end +end diff --git a/db/migrate/20241205160055_add_devise_trackable_columns_to_users.rb b/db/migrate/20241205160055_add_devise_trackable_columns_to_users.rb new file mode 100644 index 00000000..80cccf4a --- /dev/null +++ b/db/migrate/20241205160055_add_devise_trackable_columns_to_users.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class AddDeviseTrackableColumnsToUsers < ActiveRecord::Migration[7.2] + def change + change_table :users, bulk: true do |t| + 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 + end + end +end diff --git a/db/migrate/[timestamp]_add_index_to_points_timestamp.rb b/db/migrate/[timestamp]_add_index_to_points_timestamp.rb new file mode 100644 index 00000000..8e4bc3fa --- /dev/null +++ b/db/migrate/[timestamp]_add_index_to_points_timestamp.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddIndexToPointsTimestamp < ActiveRecord::Migration[7.2] + disable_ddl_transaction! + + def change + add_index :points, %i[user_id timestamp], algorithm: :concurrently + end +end diff --git a/db/schema.rb b/db/schema.rb index 1c5c6e49..2927e2d5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.2].define(version: 2024_12_02_114820) do +ActiveRecord::Schema[7.2].define(version: 2024_12_05_160055) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -210,6 +210,11 @@ ActiveRecord::Schema[7.2].define(version: 2024_12_02_114820) do t.string "theme", default: "dark", null: false t.jsonb "settings", default: {"fog_of_war_meters"=>"100", "meters_between_routes"=>"1000", "minutes_between_routes"=>"60"} t.boolean "admin", default: false + 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.index ["email"], name: "index_users_on_email", unique: true t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end diff --git a/docker-compose.yml b/docker-compose.yml index 034172a5..c04194f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -69,6 +69,7 @@ services: PROMETHEUS_EXPORTER_ENABLED: false PROMETHEUS_EXPORTER_HOST: 0.0.0.0 PROMETHEUS_EXPORTER_PORT: 9394 + DISABLE_TELEMETRY: false # More on telemetry: https://dawarich.app/docs/tutorials/telemetry logging: driver: "json-file" options: @@ -123,6 +124,7 @@ services: PROMETHEUS_EXPORTER_ENABLED: false PROMETHEUS_EXPORTER_HOST: dawarich_app PROMETHEUS_EXPORTER_PORT: 9394 + DISABLE_TELEMETRY: false # More on telemetry: https://dawarich.app/docs/tutorials/telemetry logging: driver: "json-file" options: diff --git a/docs/How_to_install_Dawarich_using_Docker.md b/docs/How_to_install_Dawarich_using_Docker.md index 4a947f89..28a6c9c0 100644 --- a/docs/How_to_install_Dawarich_using_Docker.md +++ b/docs/How_to_install_Dawarich_using_Docker.md @@ -8,4 +8,4 @@ This command use [docker-compose.yml](../docker-compose.yml) to build your local When this command done successfully and all services in containers will start you can open Dawarich web UI by this link [http://127.0.0.1:3000](http://127.0.0.1:3000). -Default credentials for first login in are `user@domain.com` and `password`. +Default credentials for first login in are `demo@dawarich.app` and `password`. diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 2d4e654f..f3fe9d7b 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -23,7 +23,7 @@ FactoryBot.define do admin { true } end - trait :with_immich_credentials do + trait :with_immich_integration do settings do { immich_url: 'https://immich.example.com', @@ -31,5 +31,14 @@ FactoryBot.define do } end end + + trait :with_photoprism_integration do + settings do + { + photoprism_url: 'https://photoprism.example.com', + photoprism_api_key: '1234567890' + } + end + end end end diff --git a/spec/fixtures/files/geojson/export_same_points.json b/spec/fixtures/files/geojson/export_same_points.json index 7a20a47f..45fbe6a2 100644 --- a/spec/fixtures/files/geojson/export_same_points.json +++ b/spec/fixtures/files/geojson/export_same_points.json @@ -1 +1 @@ -{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":"2021-01-01T00:00:00.000+01:00"}}]} +{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":null}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":null}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":null}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":null}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":null}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":null}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":null}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":null}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":null}},{"type":"Feature","geometry":{"type":"Point","coordinates":["37.6173","55.755826"]},"properties":{"battery_status":"unplugged","ping":"MyString","battery":1,"tracker_id":"MyString","topic":"MyString","altitude":1,"longitude":"37.6173","velocity":"0","trigger":"background_event","bssid":"MyString","ssid":"MyString","connection":"wifi","vertical_accuracy":1,"accuracy":1,"timestamp":1609459200,"latitude":"55.755826","mode":1,"inrids":[],"in_regions":[],"city":null,"country":null,"geodata":{},"reverse_geocoded_at":null}}]} diff --git a/spec/fixtures/files/owntracks/2024-03.rec b/spec/fixtures/files/owntracks/2024-03.rec index 2f2508b1..473591f7 100644 --- a/spec/fixtures/files/owntracks/2024-03.rec +++ b/spec/fixtures/files/owntracks/2024-03.rec @@ -6,5 +6,8 @@ 2024-03-01T18:33:03Z * {"cog":18,"batt":85,"lon":13.337,"acc":5,"bs":1,"p":100.347,"vel":4,"vac":3,"lat":52.230,"topic":"owntracks/test/iPhone 12 Pro","conn":"m","m":1,"tst":1709317983,"alt":36,"_type":"location","tid":"RO","_http":true} 2024-03-01T18:40:11Z * {"cog":43,"batt":85,"lon":13.338,"acc":5,"bs":1,"p":100.348,"vel":6,"vac":3,"lat":52.231,"topic":"owntracks/test/iPhone 12 Pro","conn":"m","m":1,"tst":1709318411,"alt":37,"_type":"location","tid":"RO","_http":true} 2024-03-01T18:42:57Z * {"cog":320,"batt":85,"lon":13.339,"acc":5,"bs":1,"p":100.353,"vel":3,"vac":3,"lat":52.232,"topic":"owntracks/test/iPhone 12 Pro","t":"v","conn":"m","m":1,"tst":1709318577,"alt":37,"_type":"location","tid":"RO","_http":true} +2024-03-01T18:40:08Z lwt {"_type":"lwt","tst":1717459208} +2024-03-01T18:40:09Z waypoints {"_type":"waypoint","desc":"Home","lat":52.232,"lon":13.339,"rad":50,"tst":1717459768} +2024-03-01T18:40:10Z event {"_type":"transition","acc":5,"desc":"Home","event":"enter","lat":52.232,"lon":13.339,"t":"l","tid":"s8","tst":1717460098,"wtst":1717459768} 2024-03-01T18:40:11Z * {"cog":43,"batt":85,"lon":13.338,"acc":5,"bs":1,"p":100.348,"vel":6,"vac":3,"lat":52.231,"topic":"owntracks/test/iPhone 12 Pro","conn":"m","m":1,"tst":1709318411,"alt":37,"_type":"location","tid":"RO","_http":true} 2024-03-01T18:40:11Z * {"cog":43,"batt":85,"lon":13.341,"acc":5,"bs":1,"p":100.348,"created_at":1709318940,"vel":6,"vac":3,"lat":52.234,"topic":"owntracks/test/iPhone 12 Pro","conn":"m","m":1,"tst":1709318411,"alt":37,"_type":"location","tid":"RO","_http":true} diff --git a/spec/jobs/bulk_stats_calculating_job_spec.rb b/spec/jobs/bulk_stats_calculating_job_spec.rb index be3cc1b4..15bbc9fb 100644 --- a/spec/jobs/bulk_stats_calculating_job_spec.rb +++ b/spec/jobs/bulk_stats_calculating_job_spec.rb @@ -4,14 +4,17 @@ require 'rails_helper' RSpec.describe BulkStatsCalculatingJob, type: :job do describe '#perform' do - it 'enqueues Stats::CalculatingJob for each user' do - user1 = create(:user) - user2 = create(:user) - user3 = create(:user) + let(:user1) { create(:user) } + let(:user2) { create(:user) } - expect(Stats::CalculatingJob).to receive(:perform_later).with(user1.id) - expect(Stats::CalculatingJob).to receive(:perform_later).with(user2.id) - expect(Stats::CalculatingJob).to receive(:perform_later).with(user3.id) + let(:timestamp) { DateTime.new(2024, 1, 1).to_i } + + let!(:points1) { create_list(:point, 10, user_id: user1.id, timestamp:) } + let!(:points2) { create_list(:point, 10, user_id: user2.id, timestamp:) } + + it 'enqueues Stats::CalculatingJob for each user' do + expect(Stats::CalculatingJob).to receive(:perform_later).with(user1.id, 2024, 1) + expect(Stats::CalculatingJob).to receive(:perform_later).with(user2.id, 2024, 1) BulkStatsCalculatingJob.perform_now end diff --git a/spec/jobs/import_job_spec.rb b/spec/jobs/import_job_spec.rb index 45532506..aa6d3e22 100644 --- a/spec/jobs/import_job_spec.rb +++ b/spec/jobs/import_job_spec.rb @@ -8,16 +8,14 @@ RSpec.describe ImportJob, type: :job do let(:user) { create(:user) } let!(:import) { create(:import, user:, name: 'owntracks_export.json') } - let!(:import_points) { create_list(:point, 9, import: import) } - let(:start_at) { Time.zone.at(1_709_283_789) } # Timestamp of the first point in the "2024-03.rec" fixture file - let(:end_at) { import.points.reload.order(:timestamp).last.recorded_at } it 'creates points' do expect { perform }.to change { Point.count }.by(9) end it 'calls Stats::CalculatingJob' do - expect(Stats::CalculatingJob).to receive(:perform_later).with(user.id, start_at:, end_at:) + # Timestamp of the first point in the "2024-03.rec" fixture file + expect(Stats::CalculatingJob).to receive(:perform_later).with(user.id, 2024, 3) perform end diff --git a/spec/jobs/stats/calculating_job_spec.rb b/spec/jobs/stats/calculating_job_spec.rb index a8b95de5..fdab7593 100644 --- a/spec/jobs/stats/calculating_job_spec.rb +++ b/spec/jobs/stats/calculating_job_spec.rb @@ -5,24 +5,36 @@ require 'rails_helper' RSpec.describe Stats::CalculatingJob, type: :job do describe '#perform' do let!(:user) { create(:user) } - let(:start_at) { nil } - let(:end_at) { nil } - subject { described_class.perform_now(user.id) } + subject { described_class.perform_now(user.id, 2024, 1) } before do - allow(Stats::Calculate).to receive(:new).and_call_original - allow_any_instance_of(Stats::Calculate).to receive(:call) + allow(Stats::CalculateMonth).to receive(:new).and_call_original + allow_any_instance_of(Stats::CalculateMonth).to receive(:call) end - it 'calls Stats::Calculate service' do + it 'calls Stats::CalculateMonth service' do subject - expect(Stats::Calculate).to have_received(:new).with(user.id, { start_at:, end_at: }) + expect(Stats::CalculateMonth).to have_received(:new).with(user.id, 2024, 1) end - it 'created notifications' do - expect { subject }.to change { Notification.count }.by(1) + context 'when Stats::CalculateMonth raises an error' do + before do + allow_any_instance_of(Stats::CalculateMonth).to receive(:call).and_raise(StandardError) + end + + it 'creates an error notification' do + expect { subject }.to change { Notification.count }.by(1) + expect(Notification.last.kind).to eq('error') + end + end + + context 'when Stats::CalculateMonth does not raise an error' do + it 'creates an info notification' do + expect { subject }.to change { Notification.count }.by(1) + expect(Notification.last.kind).to eq('info') + end end end end diff --git a/spec/jobs/telemetry_sending_job_spec.rb b/spec/jobs/telemetry_sending_job_spec.rb new file mode 100644 index 00000000..0acef0ee --- /dev/null +++ b/spec/jobs/telemetry_sending_job_spec.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe TelemetrySendingJob, type: :job do + describe '#perform' do + let(:gather_service) { instance_double(Telemetry::Gather) } + let(:send_service) { instance_double(Telemetry::Send) } + let(:telemetry_data) { { some: 'data' } } + + before do + allow(Telemetry::Gather).to receive(:new).and_return(gather_service) + allow(gather_service).to receive(:call).and_return(telemetry_data) + allow(Telemetry::Send).to receive(:new).with(telemetry_data).and_return(send_service) + allow(send_service).to receive(:call) + end + + it 'gathers telemetry data and sends it' do + described_class.perform_now + + expect(gather_service).to have_received(:call) + expect(send_service).to have_received(:call) + end + + context 'when DISABLE_TELEMETRY is set to true' do + before do + stub_const('ENV', ENV.to_h.merge('DISABLE_TELEMETRY' => 'true')) + end + + it 'does not send telemetry data' do + described_class.perform_now + + expect(send_service).not_to have_received(:call) + end + end + end +end diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb index 3ac6130d..d6c7efc8 100644 --- a/spec/models/import_spec.rb +++ b/spec/models/import_spec.rb @@ -17,8 +17,19 @@ RSpec.describe Import, type: :model do google_phone_takeout: 3, gpx: 4, immich_api: 5, - geojson: 6 + geojson: 6, + photoprism_api: 7 ) end end + + describe '#years_and_months_tracked' do + let(:import) { create(:import) } + let(:timestamp) { Time.zone.local(2024, 11, 1) } + let!(:points) { create_list(:point, 3, import:, timestamp:) } + + it 'returns years and months tracked' do + expect(import.years_and_months_tracked).to eq([[2024, 11]]) + end + end end diff --git a/spec/models/stat_spec.rb b/spec/models/stat_spec.rb index 369a8e87..ae65afd2 100644 --- a/spec/models/stat_spec.rb +++ b/spec/models/stat_spec.rb @@ -51,30 +51,6 @@ RSpec.describe Stat, type: :model do end end - describe '.years' do - subject { described_class.years } - - context 'when there are no stats' do - it 'returns years' do - expect(subject).to eq([Time.current.year]) - end - end - - context 'when there are stats' do - let(:user) { create(:user) } - let(:expected_years) { (year..Time.current.year).to_a.reverse } - - before do - create(:stat, year: 2021, user:) - create(:stat, year: 2020, user:) - end - - it 'returns years' do - expect(subject).to eq(expected_years) - end - end - end - describe '#distance_by_day' do subject { stat.distance_by_day } @@ -146,5 +122,17 @@ RSpec.describe Stat, type: :model do end end end + + describe '#points' do + subject { stat.points.to_a } + + let(:stat) { create(:stat, year:, month: 1, user:) } + let(:timestamp) { DateTime.new(year, 1, 1, 5, 0, 0) } + let!(:points) { create_list(:point, 3, user:, timestamp:) } + + it 'returns points' do + expect(subject).to eq(points) + end + end end end diff --git a/spec/models/trip_spec.rb b/spec/models/trip_spec.rb index b19f348c..032185bd 100644 --- a/spec/models/trip_spec.rb +++ b/spec/models/trip_spec.rb @@ -41,7 +41,7 @@ RSpec.describe Trip, type: :model do end end - describe '#photos' do + describe '#photo_previews' do let(:photo_data) do [ { @@ -80,8 +80,18 @@ RSpec.describe Trip, type: :model do let(:trip) { create(:trip, user:) } let(:expected_photos) do [ - { url: "/api/v1/photos/456/thumbnail.jpg?api_key=#{user.api_key}" }, - { url: "/api/v1/photos/789/thumbnail.jpg?api_key=#{user.api_key}" } + { + id: '456', + url: "/api/v1/photos/456/thumbnail.jpg?api_key=#{user.api_key}&source=immich", + source: 'immich', + orientation: 'portrait' + }, + { + id: '789', + url: "/api/v1/photos/789/thumbnail.jpg?api_key=#{user.api_key}&source=immich", + source: 'immich', + orientation: 'portrait' + } ] end @@ -93,7 +103,7 @@ RSpec.describe Trip, type: :model do let(:settings) { {} } it 'returns an empty array' do - expect(trip.photos).to eq([]) + expect(trip.photo_previews).to eq([]) end end @@ -106,7 +116,9 @@ RSpec.describe Trip, type: :model do end it 'returns the photos' do - expect(trip.photos).to eq(expected_photos) + expect(trip.photo_previews).to include(expected_photos[0]) + expect(trip.photo_previews).to include(expected_photos[1]) + expect(trip.photo_previews.size).to eq(2) end end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index c98325dd..26bd7e27 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -113,5 +113,15 @@ RSpec.describe User, type: :model do expect(subject).to eq(1) end end + + describe '#years_tracked' do + let!(:points) { create_list(:point, 3, user:, timestamp: DateTime.new(2024, 1, 1, 5, 0, 0)) } + + subject { user.years_tracked } + + it 'returns years tracked' do + expect(subject).to eq([2024]) + end + end end end diff --git a/spec/requests/api/v1/photos_spec.rb b/spec/requests/api/v1/photos_spec.rb index d15a5342..8c8811b6 100644 --- a/spec/requests/api/v1/photos_spec.rb +++ b/spec/requests/api/v1/photos_spec.rb @@ -4,40 +4,68 @@ require 'rails_helper' RSpec.describe 'Api::V1::Photos', type: :request do describe 'GET /index' do - let(:user) { create(:user) } + context 'when the integration is configured' do + let(:user) { create(:user, :with_photoprism_integration) } - let(:photo_data) do - [ - { - 'id' => '123', - 'latitude' => 35.6762, - 'longitude' => 139.6503, - 'localDateTime' => '2024-01-01T00:00:00.000Z', - 'type' => 'photo' - }, - { - 'id' => '456', - 'latitude' => 40.7128, - 'longitude' => -74.0060, - 'localDateTime' => '2024-01-02T00:00:00.000Z', - 'type' => 'photo' - } - ] + let(:photo_data) do + [ + { + 'id' => 1, + 'latitude' => 35.6762, + 'longitude' => 139.6503, + 'localDateTime' => '2024-01-01T00:00:00.000Z', + 'originalFileName' => 'photo1.jpg', + 'city' => 'Tokyo', + 'state' => 'Tokyo', + 'country' => 'Japan', + 'type' => 'photo', + 'source' => 'photoprism' + }, + { + 'id' => 2, + 'latitude' => 40.7128, + 'longitude' => -74.0060, + 'localDateTime' => '2024-01-02T00:00:00.000Z', + 'originalFileName' => 'photo2.jpg', + 'city' => 'New York', + 'state' => 'New York', + 'country' => 'USA', + 'type' => 'photo', + 'source' => 'immich' + } + ] + end + + context 'when the request is successful' do + before do + allow_any_instance_of(Photos::Search).to receive(:call).and_return(photo_data) + + get '/api/v1/photos', params: { api_key: user.api_key } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'returns photos data as JSON' do + expect(JSON.parse(response.body)).to eq(photo_data) + end + end end - context 'when the request is successful' do + context 'when the integration is not configured' do + let(:user) { create(:user) } + before do - allow_any_instance_of(Immich::RequestPhotos).to receive(:call).and_return(photo_data) - - get '/api/v1/photos', params: { api_key: user.api_key } + get '/api/v1/photos', params: { api_key: user.api_key, source: 'immich' } end - it 'returns http success' do - expect(response).to have_http_status(:success) + it 'returns http unauthorized' do + expect(response).to have_http_status(:unauthorized) end - it 'returns photos data as JSON' do - expect(JSON.parse(response.body)).to eq(photo_data) + it 'returns an error message' do + expect(JSON.parse(response.body)).to eq({ 'error' => 'Immich integration not configured' }) end end end diff --git a/spec/requests/stats_spec.rb b/spec/requests/stats_spec.rb index 3afb9516..40c19823 100644 --- a/spec/requests/stats_spec.rb +++ b/spec/requests/stats_spec.rb @@ -54,8 +54,14 @@ RSpec.describe '/stats', type: :request do describe 'POST /update' do let(:stat) { create(:stat, user:, year: 2024) } - it 'enqueues Stats::CalculatingJob' do - expect { post stats_url(stat.year) }.to have_enqueued_job(Stats::CalculatingJob) + it 'enqueues Stats::CalculatingJob for each tracked year and month' do + allow(user).to receive(:years_tracked).and_return([2024]) + + post stats_url + + (1..12).each do |month| + expect(Stats::CalculatingJob).to have_been_enqueued.with(user.id, 2024, month) + end end end end diff --git a/spec/requests/trips_spec.rb b/spec/requests/trips_spec.rb index 20daa652..d0e1e794 100644 --- a/spec/requests/trips_spec.rb +++ b/spec/requests/trips_spec.rb @@ -25,7 +25,7 @@ RSpec.describe '/trips', type: :request do stub_request(:any, 'https://api.github.com/repos/Freika/dawarich/tags') .to_return(status: 200, body: '[{"name": "1.0.0"}]', headers: {}) - allow_any_instance_of(Trip).to receive(:photos).and_return([]) + allow_any_instance_of(Trip).to receive(:photo_previews).and_return([]) sign_in user end diff --git a/spec/serializers/api/photo_serializer_spec.rb b/spec/serializers/api/photo_serializer_spec.rb new file mode 100644 index 00000000..7d354d16 --- /dev/null +++ b/spec/serializers/api/photo_serializer_spec.rb @@ -0,0 +1,162 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Api::PhotoSerializer do + describe '#call' do + subject(:serialized_photo) { described_class.new(photo, source).call } + + context 'when photo is from immich' do + let(:source) { 'immich' } + let(:photo) do + { + "id": '7fe486e3-c3ba-4b54-bbf9-1281b39ed15c', + "deviceAssetId": 'IMG_9913.jpeg-1168914', + "ownerId": 'f579f328-c355-438c-a82c-fe3390bd5f08', + "deviceId": 'CLI', + "libraryId": nil, + "type": 'IMAGE', + "originalPath": 'upload/library/admin/2023/2023-06-08/IMG_9913.jpeg', + "originalFileName": 'IMG_9913.jpeg', + "originalMimeType": 'image/jpeg', + "thumbhash": '4RgONQaZqYaH93g3h3p3d6RfPPrG', + "fileCreatedAt": '2023-06-08T07:58:45.637Z', + "fileModifiedAt": '2023-06-08T09:58:45.000Z', + "localDateTime": '2023-06-08T09:58:45.637Z', + "updatedAt": '2024-08-24T18:20:47.965Z', + "isFavorite": false, + "isArchived": false, + "isTrashed": false, + "duration": '0:00:00.00000', + "exifInfo": { + "make": 'Apple', + "model": 'iPhone 12 Pro', + "exifImageWidth": 4032, + "exifImageHeight": 3024, + "fileSizeInByte": 1_168_914, + "orientation": '6', + "dateTimeOriginal": '2023-06-08T07:58:45.637Z', + "modifyDate": '2023-06-08T07:58:45.000Z', + "timeZone": 'Europe/Berlin', + "lensModel": 'iPhone 12 Pro back triple camera 4.2mm f/1.6', + "fNumber": 1.6, + "focalLength": 4.2, + "iso": 320, + "exposureTime": '1/60', + "latitude": 52.11, + "longitude": 13.22, + "city": 'Johannisthal', + "state": 'Berlin', + "country": 'Germany', + "description": '', + "projectionType": nil, + "rating": nil + }, + "livePhotoVideoId": nil, + "people": [], + "checksum": 'aL1edPVg4ZpEnS6xCRWNUY0pUS8=', + "isOffline": false, + "hasMetadata": true, + "duplicateId": '88a34bee-783d-46e4-aa52-33b75ffda375', + "resized": true + } + end + + it 'serializes the photo correctly' do + expect(serialized_photo).to eq( + id: '7fe486e3-c3ba-4b54-bbf9-1281b39ed15c', + latitude: 52.11, + longitude: 13.22, + localDateTime: '2023-06-08T09:58:45.637Z', + originalFileName: 'IMG_9913.jpeg', + city: 'Johannisthal', + state: 'Berlin', + country: 'Germany', + type: 'image', + orientation: 'portrait', + source: 'immich' + ) + end + end + + context 'when photo is from photoprism' do + let(:source) { 'photoprism' } + let(:photo) do + { + 'ID' => '102', + 'UID' => 'psnver0s3x7wxfnh', + 'Type' => 'image', + 'TypeSrc' => '', + 'TakenAt' => '2023-10-10T16:04:33Z', + 'TakenAtLocal' => '2023-10-10T16:04:33Z', + 'TakenSrc' => 'name', + 'TimeZone' => '', + 'Path' => '2023/10', + 'Name' => '20231010_160433_91981432', + 'OriginalName' => 'photo_2023-10-10 16.04.33', + 'Title' => 'Photo / 2023', + 'Description' => '', + 'Year' => 2023, + 'Month' => 10, + 'Day' => 10, + 'Country' => 'zz', + 'Stack' => 0, + 'Favorite' => false, + 'Private' => false, + 'Iso' => 0, + 'FocalLength' => 0, + 'FNumber' => 0, + 'Exposure' => '', + 'Quality' => 1, + 'Resolution' => 1, + 'Color' => 4, + 'Scan' => false, + 'Panorama' => false, + 'CameraID' => 1, + 'CameraModel' => 'Unknown', + 'LensID' => 1, + 'LensModel' => 'Unknown', + 'Lat' => 11, + 'Lng' => 22, + 'CellID' => 'zz', + 'PlaceID' => 'zz', + 'PlaceSrc' => '', + 'PlaceLabel' => 'Unknown', + 'PlaceCity' => 'Unknown', + 'PlaceState' => 'Unknown', + 'PlaceCountry' => 'zz', + 'InstanceID' => '', + 'FileUID' => 'fsnver0clrfzatmz', + 'FileRoot' => '/', + 'FileName' => '2023/10/20231010_160433_91981432.jpeg', + 'Hash' => 'ce1849fd7cf6a50eb201fbb669ab78c7ac13263b', + 'Width' => 1280, + 'Height' => 908, + 'Portrait' => false, + 'Merged' => false, + 'CreatedAt' => '2024-12-02T14:25:48Z', + 'UpdatedAt' => '2024-12-02T14:36:45Z', + 'EditedAt' => '0001-01-01T00:00:00Z', + 'CheckedAt' => '2024-12-02T14:36:45Z', + 'Files' => nil + } + end + + it 'serializes the photo correctly' do + expect(serialized_photo).to eq( + id: 'ce1849fd7cf6a50eb201fbb669ab78c7ac13263b', + latitude: 11, + longitude: 22, + localDateTime: '2023-10-10T16:04:33Z', + originalFileName: 'photo_2023-10-10 16.04.33', + city: 'Unknown', + state: 'Unknown', + country: 'zz', + type: 'image', + orientation: 'landscape', + source: 'photoprism' + ) + end + end + end +end diff --git a/spec/services/immich/request_photos_spec.rb b/spec/services/immich/request_photos_spec.rb index 255e6cd0..041ed4fd 100644 --- a/spec/services/immich/request_photos_spec.rb +++ b/spec/services/immich/request_photos_spec.rb @@ -9,7 +9,7 @@ RSpec.describe Immich::RequestPhotos do let(:user) do create(:user, settings: { 'immich_url' => 'http://immich.app', 'immich_api_key' => '123456' }) end - let(:immich_data) do + let(:mock_immich_data) do { "albums": { "total": 0, @@ -134,11 +134,11 @@ RSpec.describe Immich::RequestPhotos do stub_request( :any, 'http://immich.app/api/search/metadata' - ).to_return(status: 200, body: immich_data, headers: {}) + ).to_return(status: 200, body: mock_immich_data, headers: {}) end it 'returns images and videos' do - expect(service.map { _1['type'] }.uniq).to eq(['IMAGE', 'VIDEO']) + expect(service.map { _1['type'] }.uniq).to eq(%w[IMAGE VIDEO]) end end diff --git a/spec/services/imports/create_spec.rb b/spec/services/imports/create_spec.rb new file mode 100644 index 00000000..85f2131a --- /dev/null +++ b/spec/services/imports/create_spec.rb @@ -0,0 +1,113 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Imports::Create do + let(:user) { create(:user) } + let(:service) { described_class.new(user, import) } + + describe '#call' do + context 'when source is google_semantic_history' do + let(:import) { create(:import, source: 'google_semantic_history') } + + it 'calls the GoogleMaps::SemanticHistoryParser' do + expect(GoogleMaps::SemanticHistoryParser).to \ + receive(:new).with(import, user.id).and_return(double(call: true)) + service.call + end + end + + context 'when source is google_phone_takeout' do + let(:import) { create(:import, source: 'google_phone_takeout') } + + it 'calls the GoogleMaps::PhoneTakeoutParser' do + expect(GoogleMaps::PhoneTakeoutParser).to \ + receive(:new).with(import, user.id).and_return(double(call: true)) + service.call + end + end + + context 'when source is owntracks' do + let(:import) { create(:import, source: 'owntracks') } + + it 'calls the OwnTracks::ExportParser' do + expect(OwnTracks::ExportParser).to \ + receive(:new).with(import, user.id).and_return(double(call: true)) + service.call + end + + context 'when import is successful' do + it 'creates a finished notification' do + service.call + + expect(user.notifications.last.kind).to eq('info') + end + + it 'schedules stats creating' do + Sidekiq::Testing.inline! do + expect { service.call }.to \ + have_enqueued_job(Stats::CalculatingJob).with(user.id, 2024, 3) + end + end + + it 'schedules visit suggesting' do + Sidekiq::Testing.inline! do + expect { service.call }.to have_enqueued_job(VisitSuggestingJob) + end + end + end + + context 'when import fails' do + before do + allow(OwnTracks::ExportParser).to receive(:new).with(import, user.id).and_return(double(call: false)) + end + + it 'creates a failed notification' do + service.call + + expect(user.notifications.last.kind).to eq('error') + end + end + end + + context 'when source is gpx' do + let(:import) { create(:import, source: 'gpx') } + + it 'calls the Gpx::TrackParser' do + expect(Gpx::TrackParser).to \ + receive(:new).with(import, user.id).and_return(double(call: true)) + service.call + end + end + + context 'when source is geojson' do + let(:import) { create(:import, source: 'geojson') } + + it 'calls the Geojson::ImportParser' do + expect(Geojson::ImportParser).to \ + receive(:new).with(import, user.id).and_return(double(call: true)) + service.call + end + end + + context 'when source is immich_api' do + let(:import) { create(:import, source: 'immich_api') } + + it 'calls the Photos::ImportParser' do + expect(Photos::ImportParser).to \ + receive(:new).with(import, user.id).and_return(double(call: true)) + service.call + end + end + + context 'when source is photoprism_api' do + let(:import) { create(:import, source: 'photoprism_api') } + + it 'calls the Photos::ImportParser' do + expect(Photos::ImportParser).to \ + receive(:new).with(import, user.id).and_return(double(call: true)) + service.call + end + end + end +end diff --git a/spec/services/photoprism/cache_preview_token_spec.rb b/spec/services/photoprism/cache_preview_token_spec.rb new file mode 100644 index 00000000..298aee98 --- /dev/null +++ b/spec/services/photoprism/cache_preview_token_spec.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Photoprism::CachePreviewToken, type: :service do + let(:user) { double('User', id: 1) } + let(:preview_token) { 'sample_token' } + let(:service) { described_class.new(user, preview_token) } + + describe '#call' do + it 'writes the preview token to the cache with the correct key' do + expect(Rails.cache).to receive(:write).with( + "dawarich/photoprism_preview_token_#{user.id}", preview_token + ) + + service.call + end + end +end diff --git a/spec/services/photoprism/import_geodata_spec.rb b/spec/services/photoprism/import_geodata_spec.rb new file mode 100644 index 00000000..341348fc --- /dev/null +++ b/spec/services/photoprism/import_geodata_spec.rb @@ -0,0 +1,177 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Photoprism::ImportGeodata do + describe '#call' do + subject(:service) { described_class.new(user).call } + + let(:user) do + create(:user, settings: { 'photoprism_url' => 'http://photoprism.app', 'photoprism_api_key' => '123456' }) + end + let(:photoprism_data) do + [ + { + 'ID' => '82', + 'UID' => 'psnveqq089xhy1c3', + 'Type' => 'image', + 'TypeSrc' => '', + 'TakenAt' => '2024-08-18T14:11:05Z', + 'TakenAtLocal' => '2024-08-18T16:11:05Z', + 'TakenSrc' => 'meta', + 'TimeZone' => 'Europe/Prague', + 'Path' => '2024/08', + 'Name' => '20240818_141105_44E61AED', + 'OriginalName' => 'PXL_20240818_141105789', + 'Title' => 'Moment / Karlovy Vary / 2024', + 'Description' => '', + 'Year' => 2024, + 'Month' => 8, + 'Day' => 18, + 'Country' => 'cz', + 'Stack' => 0, + 'Favorite' => false, + 'Private' => false, + 'Iso' => 37, + 'FocalLength' => 21, + 'FNumber' => 2.2, + 'Exposure' => '1/347', + 'Quality' => 4, + 'Resolution' => 10, + 'Color' => 2, + 'Scan' => false, + 'Panorama' => false, + 'CameraID' => 8, + 'CameraSrc' => 'meta', + 'CameraMake' => 'Google', + 'CameraModel' => 'Pixel 7 Pro', + 'LensID' => 11, + 'LensMake' => 'Google', + 'LensModel' => 'Pixel 7 Pro front camera 2.74mm f/2.2', + 'Altitude' => 423, + 'Lat' => 50.11, + 'Lng' => 12.12, + 'CellID' => 's2:47a09944f33c', + 'PlaceID' => 'cz:ciNqTjWuq6NN', + 'PlaceSrc' => 'meta', + 'PlaceLabel' => 'Karlovy Vary, Severozápad, Czech Republic', + 'PlaceCity' => 'Karlovy Vary', + 'PlaceState' => 'Severozápad', + 'PlaceCountry' => 'cz', + 'InstanceID' => '', + 'FileUID' => 'fsnveqqeusn692qo', + 'FileRoot' => '/', + 'FileName' => '2024/08/20240818_141105_44E61AED.jpg', + 'Hash' => 'cc5d0f544e52b288d7c8460d2e1bb17fa66e6089', + 'Width' => 2736, + 'Height' => 3648, + 'Portrait' => true, + 'Merged' => false, + 'CreatedAt' => '2024-12-02T14:25:38Z', + 'UpdatedAt' => '2024-12-02T14:25:38Z', + 'EditedAt' => '0001-01-01T00:00:00Z', + 'CheckedAt' => '2024-12-02T14:36:45Z', + 'Files' => nil + }, + { + 'ID' => '81', + 'UID' => 'psnveqpl96gcfdzf', + 'Type' => 'image', + 'TypeSrc' => '', + 'TakenAt' => '2024-08-18T14:11:04Z', + 'TakenAtLocal' => '2024-08-18T16:11:04Z', + 'TakenSrc' => 'meta', + 'TimeZone' => 'Europe/Prague', + 'Path' => '2024/08', + 'Name' => '20240818_141104_E9949CD4', + 'OriginalName' => 'PXL_20240818_141104633', + 'Title' => 'Portrait / Karlovy Vary / 2024', + 'Description' => '', + 'Year' => 2024, + 'Month' => 8, + 'Day' => 18, + 'Country' => 'cz', + 'Stack' => 0, + 'Favorite' => false, + 'Private' => false, + 'Iso' => 43, + 'FocalLength' => 21, + 'FNumber' => 2.2, + 'Exposure' => '1/356', + 'Faces' => 1, + 'Quality' => 4, + 'Resolution' => 10, + 'Color' => 2, + 'Scan' => false, + 'Panorama' => false, + 'CameraID' => 8, + 'CameraSrc' => 'meta', + 'CameraMake' => 'Google', + 'CameraModel' => 'Pixel 7 Pro', + 'LensID' => 11, + 'LensMake' => 'Google', + 'LensModel' => 'Pixel 7 Pro front camera 2.74mm f/2.2', + 'Altitude' => 423, + 'Lat' => 50.21, + 'Lng' => 12.85, + 'CellID' => 's2:47a09944f33c', + 'PlaceID' => 'cz:ciNqTjWuq6NN', + 'PlaceSrc' => 'meta', + 'PlaceLabel' => 'Karlovy Vary, Severozápad, Czech Republic', + 'PlaceCity' => 'Karlovy Vary', + 'PlaceState' => 'Severozápad', + 'PlaceCountry' => 'cz', + 'InstanceID' => '', + 'FileUID' => 'fsnveqp9xsl7onsv', + 'FileRoot' => '/', + 'FileName' => '2024/08/20240818_141104_E9949CD4.jpg', + 'Hash' => 'd5dfadc56a0b63051dfe0b5dec55ff1d81f033b7', + 'Width' => 2736, + 'Height' => 3648, + 'Portrait' => true, + 'Merged' => false, + 'CreatedAt' => '2024-12-02T14:25:37Z', + 'UpdatedAt' => '2024-12-02T14:25:37Z', + 'EditedAt' => '0001-01-01T00:00:00Z', + 'CheckedAt' => '2024-12-02T14:36:45Z', + 'Files' => nil + } + ].to_json + end + + before do + stub_request(:get, %r{http://photoprism\.app/api/v1/photos}).with( + headers: { + 'Accept' => 'application/json', + 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', + 'Authorization' => 'Bearer 123456', + 'User-Agent' => 'Ruby' + } + ).to_return(status: 200, body: photoprism_data, headers: {}) + end + + it 'creates import' do + expect { service }.to change { Import.count }.by(1) + end + + it 'enqueues ImportJob' do + expect(ImportJob).to receive(:perform_later) + + service + end + + context 'when import already exists' do + before { service } + + it 'does not create new import' do + expect { service }.not_to(change { Import.count }) + end + + it 'does not enqueue ImportJob' do + expect(ImportJob).to_not receive(:perform_later) + + service + end + end + end +end diff --git a/spec/services/photoprism/request_photos_spec.rb b/spec/services/photoprism/request_photos_spec.rb new file mode 100644 index 00000000..a4461151 --- /dev/null +++ b/spec/services/photoprism/request_photos_spec.rb @@ -0,0 +1,287 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Photoprism::RequestPhotos do + let(:user) do + create( + :user, + settings: { + 'photoprism_url' => 'http://photoprism.local', + 'photoprism_api_key' => 'test_api_key' + } + ) + end + + let(:start_date) { '2024-01-01' } + let(:end_date) { '2024-12-31' } + let(:service) { described_class.new(user, start_date: start_date, end_date: end_date) } + + let(:mock_photo_response) do + [ + { + 'ID' => '82', + 'UID' => 'psnveqq089xhy1c3', + 'Type' => 'image', + 'TypeSrc' => '', + 'TakenAt' => '2024-08-18T14:11:05Z', + 'TakenAtLocal' => '2024-08-18T16:11:05Z', + 'TakenSrc' => 'meta', + 'TimeZone' => 'Europe/Prague', + 'Path' => '2024/08', + 'Name' => '20240818_141105_44E61AED', + 'OriginalName' => 'PXL_20240818_141105789', + 'Title' => 'Moment / Karlovy Vary / 2024', + 'Description' => '', + 'Year' => 2024, + 'Month' => 8, + 'Day' => 18, + 'Country' => 'cz', + 'Stack' => 0, + 'Favorite' => false, + 'Private' => false, + 'Iso' => 37, + 'FocalLength' => 21, + 'FNumber' => 2.2, + 'Exposure' => '1/347', + 'Quality' => 4, + 'Resolution' => 10, + 'Color' => 2, + 'Scan' => false, + 'Panorama' => false, + 'CameraID' => 8, + 'CameraSrc' => 'meta', + 'CameraMake' => 'Google', + 'CameraModel' => 'Pixel 7 Pro', + 'LensID' => 11, + 'LensMake' => 'Google', + 'LensModel' => 'Pixel 7 Pro front camera 2.74mm f/2.2', + 'Altitude' => 423, + 'Lat' => 50.11, + 'Lng' => 12.12, + 'CellID' => 's2:47a09944f33c', + 'PlaceID' => 'cz:ciNqTjWuq6NN', + 'PlaceSrc' => 'meta', + 'PlaceLabel' => 'Karlovy Vary, Severozápad, Czech Republic', + 'PlaceCity' => 'Karlovy Vary', + 'PlaceState' => 'Severozápad', + 'PlaceCountry' => 'cz', + 'InstanceID' => '', + 'FileUID' => 'fsnveqqeusn692qo', + 'FileRoot' => '/', + 'FileName' => '2024/08/20240818_141105_44E61AED.jpg', + 'Hash' => 'cc5d0f544e52b288d7c8460d2e1bb17fa66e6089', + 'Width' => 2736, + 'Height' => 3648, + 'Portrait' => true, + 'Merged' => false, + 'CreatedAt' => '2024-12-02T14:25:38Z', + 'UpdatedAt' => '2024-12-02T14:25:38Z', + 'EditedAt' => '0001-01-01T00:00:00Z', + 'CheckedAt' => '2024-12-02T14:36:45Z', + 'Files' => nil + }, + { + 'ID' => '81', + 'UID' => 'psnveqpl96gcfdzf', + 'Type' => 'image', + 'TypeSrc' => '', + 'TakenAt' => '2024-08-18T14:11:04Z', + 'TakenAtLocal' => '2024-08-18T16:11:04Z', + 'TakenSrc' => 'meta', + 'TimeZone' => 'Europe/Prague', + 'Path' => '2024/08', + 'Name' => '20240818_141104_E9949CD4', + 'OriginalName' => 'PXL_20240818_141104633', + 'Title' => 'Portrait / Karlovy Vary / 2024', + 'Description' => '', + 'Year' => 2024, + 'Month' => 8, + 'Day' => 18, + 'Country' => 'cz', + 'Stack' => 0, + 'Favorite' => false, + 'Private' => false, + 'Iso' => 43, + 'FocalLength' => 21, + 'FNumber' => 2.2, + 'Exposure' => '1/356', + 'Faces' => 1, + 'Quality' => 4, + 'Resolution' => 10, + 'Color' => 2, + 'Scan' => false, + 'Panorama' => false, + 'CameraID' => 8, + 'CameraSrc' => 'meta', + 'CameraMake' => 'Google', + 'CameraModel' => 'Pixel 7 Pro', + 'LensID' => 11, + 'LensMake' => 'Google', + 'LensModel' => 'Pixel 7 Pro front camera 2.74mm f/2.2', + 'Altitude' => 423, + 'Lat' => 50.21, + 'Lng' => 12.85, + 'CellID' => 's2:47a09944f33c', + 'PlaceID' => 'cz:ciNqTjWuq6NN', + 'PlaceSrc' => 'meta', + 'PlaceLabel' => 'Karlovy Vary, Severozápad, Czech Republic', + 'PlaceCity' => 'Karlovy Vary', + 'PlaceState' => 'Severozápad', + 'PlaceCountry' => 'cz', + 'InstanceID' => '', + 'FileUID' => 'fsnveqp9xsl7onsv', + 'FileRoot' => '/', + 'FileName' => '2024/08/20240818_141104_E9949CD4.jpg', + 'Hash' => 'd5dfadc56a0b63051dfe0b5dec55ff1d81f033b7', + 'Width' => 2736, + 'Height' => 3648, + 'Portrait' => true, + 'Merged' => false, + 'CreatedAt' => '2024-12-02T14:25:37Z', + 'UpdatedAt' => '2024-12-02T14:25:37Z', + 'EditedAt' => '0001-01-01T00:00:00Z', + 'CheckedAt' => '2024-12-02T14:36:45Z', + 'Files' => nil + } + ] + end + + describe '#call' do + context 'with valid credentials' do + before do + stub_request( + :any, + "#{user.settings['photoprism_url']}/api/v1/photos?after=#{start_date}&before=#{end_date}&count=1000&public=true&q=&quality=3" + ).with( + headers: { + 'Accept' => 'application/json', + 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', + 'Authorization' => 'Bearer test_api_key', + 'User-Agent' => 'Ruby' + } + ).to_return( + status: 200, + body: mock_photo_response.to_json, + headers: { 'Content-Type' => 'application/json' } + ) + + stub_request( + :any, + "#{user.settings['photoprism_url']}/api/v1/photos?after=#{start_date}&before=#{end_date}&count=1000&public=true&q=&quality=3&offset=1000" + ).to_return(status: 200, body: [].to_json) + end + + it 'returns photos within the specified date range' do + result = service.call + + expect(result).to be_an(Array) + expect(result.first['Title']).to eq('Moment / Karlovy Vary / 2024') + end + end + + context 'with missing credentials' do + let(:user) { create(:user, settings: {}) } + + it 'raises error when Photoprism URL is missing' do + expect { service.call }.to raise_error(ArgumentError, 'Photoprism URL is missing') + end + + it 'raises error when API key is missing' do + user.update(settings: { 'photoprism_url' => 'http://photoprism.local' }) + + expect { service.call }.to raise_error(ArgumentError, 'Photoprism API key is missing') + end + end + + context 'when API returns an error' do + before do + stub_request( + :get, + "#{user.settings['photoprism_url']}/api/v1/photos?after=#{start_date}&before=#{end_date}&count=1000&public=true&q=&quality=3" + ).to_return(status: 400, body: { status: 400, error: 'Unable to do that' }.to_json) + end + + it 'logs the error' do + expect(Rails.logger).to \ + receive(:error).with('Photoprism API returned 400: {"status":400,"error":"Unable to do that"}') + expect(Rails.logger).to \ + receive(:debug).with( + "Photoprism API request params: #{{ q: '', public: true, quality: 3, after: start_date, count: 1000, +before: end_date }}" + ) + + service.call + end + end + + context 'with pagination' do + let(:first_page) { [{ 'TakenAtLocal' => "#{start_date}T14:30:00Z" }] } + let(:second_page) { [{ 'TakenAtLocal' => "#{start_date}T14:30:00Z" }] } + let(:empty_page) { [] } + let(:common_headers) do + { + 'Accept' => 'application/json', + 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', + 'Authorization' => 'Bearer test_api_key', + 'User-Agent' => 'Ruby' + } + end + + before do + # First page + stub_request(:any, "#{user.settings['photoprism_url']}/api/v1/photos") + .with( + headers: common_headers, + query: { + after: start_date, + before: end_date, + count: '1000', + public: 'true', + q: '', + quality: '3' + } + ) + .to_return(status: 200, body: first_page.to_json) + + # Second page + stub_request(:any, "#{user.settings['photoprism_url']}/api/v1/photos") + .with( + headers: common_headers, + query: { + after: start_date, + before: end_date, + count: '1000', + public: 'true', + q: '', + quality: '3', + offset: '1000' + } + ) + .to_return(status: 200, body: second_page.to_json) + + # Last page (empty) + stub_request(:any, "#{user.settings['photoprism_url']}/api/v1/photos") + .with( + headers: common_headers, + query: { + after: start_date, + before: end_date, + count: '1000', + public: 'true', + q: '', + quality: '3', + offset: '2000' + } + ) + .to_return(status: 200, body: empty_page.to_json) + end + + it 'fetches all pages until empty result' do + result = service.call + + expect(result.size).to eq(2) + end + end + end +end diff --git a/spec/services/immich/import_parser_spec.rb b/spec/services/photos/import_parser_spec.rb similarity index 97% rename from spec/services/immich/import_parser_spec.rb rename to spec/services/photos/import_parser_spec.rb index cefa4dc6..33460398 100644 --- a/spec/services/immich/import_parser_spec.rb +++ b/spec/services/photos/import_parser_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Immich::ImportParser do +RSpec.describe Photos::ImportParser do describe '#call' do subject(:service) { described_class.new(import, user.id).call } diff --git a/spec/services/photos/search_spec.rb b/spec/services/photos/search_spec.rb new file mode 100644 index 00000000..ee451597 --- /dev/null +++ b/spec/services/photos/search_spec.rb @@ -0,0 +1,149 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Photos::Search do + let(:user) { create(:user) } + let(:start_date) { '2024-01-01' } + let(:end_date) { '2024-03-01' } + let(:service) { described_class.new(user, start_date: start_date, end_date: end_date) } + + describe '#call' do + context 'when user has no integrations configured' do + before do + allow(user).to receive(:immich_integration_configured?).and_return(false) + allow(user).to receive(:photoprism_integration_configured?).and_return(false) + end + + it 'returns an empty array' do + expect(service.call).to eq([]) + end + end + + context 'when user has Immich integration configured' do + let(:immich_photo) { { 'type' => 'image', 'id' => '1' } } + let(:serialized_photo) { { id: '1', source: 'immich' } } + + before do + allow(user).to receive(:immich_integration_configured?).and_return(true) + allow(user).to receive(:photoprism_integration_configured?).and_return(false) + + allow_any_instance_of(Immich::RequestPhotos).to receive(:call) + .and_return([immich_photo]) + + allow_any_instance_of(Api::PhotoSerializer).to receive(:call) + .and_return(serialized_photo) + end + + it 'fetches and transforms Immich photos' do + expect(service.call).to eq([serialized_photo]) + end + end + + context 'when user has Photoprism integration configured' do + let(:photoprism_photo) { { 'Type' => 'image', 'id' => '2' } } + let(:serialized_photo) { { id: '2', source: 'photoprism' } } + + before do + allow(user).to receive(:immich_integration_configured?).and_return(false) + allow(user).to receive(:photoprism_integration_configured?).and_return(true) + + allow_any_instance_of(Photoprism::RequestPhotos).to receive(:call) + .and_return([photoprism_photo]) + + allow_any_instance_of(Api::PhotoSerializer).to receive(:call) + .and_return(serialized_photo) + end + + it 'fetches and transforms Photoprism photos' do + expect(service.call).to eq([serialized_photo]) + end + end + + context 'when user has both integrations configured' do + let(:immich_photo) { { 'type' => 'image', 'id' => '1' } } + let(:photoprism_photo) { { 'Type' => 'image', 'id' => '2' } } + let(:serialized_immich) do + { + id: '1', + latitude: nil, + longitude: nil, + localDateTime: nil, + originalFileName: nil, + city: nil, + state: nil, + country: nil, + type: 'image', + source: 'immich', + orientation: 'landscape' + } + end + let(:serialized_photoprism) do + { + id: '2', + latitude: nil, + longitude: nil, + localDateTime: nil, + originalFileName: nil, + city: nil, + state: nil, + country: nil, + type: 'image', + source: 'photoprism', + orientation: 'landscape' + } + end + + before do + allow(user).to receive(:immich_integration_configured?).and_return(true) + allow(user).to receive(:photoprism_integration_configured?).and_return(true) + + allow_any_instance_of(Immich::RequestPhotos).to receive(:call) + .and_return([immich_photo]) + allow_any_instance_of(Photoprism::RequestPhotos).to receive(:call) + .and_return([photoprism_photo]) + end + + it 'fetches and transforms photos from both services' do + expect(service.call).to eq([serialized_immich, serialized_photoprism]) + end + end + + context 'when filtering out videos' do + let(:immich_photo) { { 'type' => 'video', 'id' => '1' } } + + before do + allow(user).to receive(:immich_integration_configured?).and_return(true) + allow(user).to receive(:photoprism_integration_configured?).and_return(false) + + allow_any_instance_of(Immich::RequestPhotos).to receive(:call) + .and_return([immich_photo]) + end + + it 'excludes video assets' do + expect(service.call).to eq([]) + end + end + end + + describe '#initialize' do + context 'with default parameters' do + let(:service_default) { described_class.new(user) } + + it 'sets default start_date' do + expect(service_default.start_date).to eq('1970-01-01') + end + + it 'sets default end_date to nil' do + expect(service_default.end_date).to be_nil + end + end + + context 'with custom parameters' do + it 'sets custom dates' do + expect(service.start_date).to eq(start_date) + expect(service.end_date).to eq(end_date) + end + end + end +end diff --git a/spec/services/photos/thumbnail_spec.rb b/spec/services/photos/thumbnail_spec.rb new file mode 100644 index 00000000..c687e370 --- /dev/null +++ b/spec/services/photos/thumbnail_spec.rb @@ -0,0 +1,77 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Photos::Thumbnail do + let(:user) { create(:user) } + let(:id) { 'photo123' } + + describe '#call' do + subject { described_class.new(user, source, id).call } + + context 'with immich source' do + let(:source) { 'immich' } + let(:api_key) { 'immich_key_123' } + let(:base_url) { 'https://photos.example.com' } + let(:expected_url) { "#{base_url}/api/assets/#{id}/thumbnail?size=preview" } + let(:expected_headers) do + { + 'accept' => 'application/octet-stream', + 'X-Api-Key' => api_key + } + end + + before do + allow(user).to receive(:settings).and_return( + 'immich_url' => base_url, + 'immich_api_key' => api_key + ) + end + + it 'fetches thumbnail with correct parameters' do + expect(HTTParty).to receive(:get) + .with(expected_url, headers: expected_headers) + .and_return('thumbnail_data') + + expect(subject).to eq('thumbnail_data') + end + end + + context 'with photoprism source' do + let(:source) { 'photoprism' } + let(:base_url) { 'https://photoprism.example.com' } + let(:preview_token) { 'preview_token_123' } + let(:expected_url) { "#{base_url}/api/v1/t/#{id}/#{preview_token}/tile_500" } + let(:expected_headers) do + { + 'accept' => 'application/octet-stream' + } + end + + before do + allow(user).to receive(:settings).and_return( + 'photoprism_url' => base_url + ) + allow(Rails.cache).to receive(:read) + .with("#{Photoprism::CachePreviewToken::TOKEN_CACHE_KEY}_#{user.id}") + .and_return(preview_token) + end + + it 'fetches thumbnail with correct parameters' do + expect(HTTParty).to receive(:get) + .with(expected_url, headers: expected_headers) + .and_return('thumbnail_data') + + expect(subject).to eq('thumbnail_data') + end + end + + context 'with unsupported source' do + let(:source) { 'unsupported' } + + it 'raises an error' do + expect { subject }.to raise_error(RuntimeError, 'Unsupported source: unsupported') + end + end + end +end diff --git a/spec/services/stats/calculate_spec.rb b/spec/services/stats/calculate_month_spec.rb similarity index 87% rename from spec/services/stats/calculate_spec.rb rename to spec/services/stats/calculate_month_spec.rb index b02e9f7d..a5ec4383 100644 --- a/spec/services/stats/calculate_spec.rb +++ b/spec/services/stats/calculate_month_spec.rb @@ -2,11 +2,13 @@ require 'rails_helper' -RSpec.describe Stats::Calculate do +RSpec.describe Stats::CalculateMonth do describe '#call' do - subject(:calculate_stats) { described_class.new(user.id).call } + subject(:calculate_stats) { described_class.new(user.id, year, month).call } let(:user) { create(:user) } + let(:year) { 2021 } + let(:month) { 1 } context 'when there are no points' do it 'does not create stats' do @@ -15,9 +17,9 @@ RSpec.describe Stats::Calculate do end context 'when there are points' do - let(:timestamp1) { DateTime.new(2021, 1, 1, 12).to_i } - let(:timestamp2) { DateTime.new(2021, 1, 1, 13).to_i } - let(:timestamp3) { DateTime.new(2021, 1, 1, 14).to_i } + let(:timestamp1) { DateTime.new(year, month, 1, 12).to_i } + let(:timestamp2) { DateTime.new(year, month, 1, 13).to_i } + let(:timestamp3) { DateTime.new(year, month, 1, 14).to_i } let!(:import) { create(:import, user:) } let!(:point1) do create(:point, diff --git a/spec/services/telemetry/gather_spec.rb b/spec/services/telemetry/gather_spec.rb new file mode 100644 index 00000000..9b962113 --- /dev/null +++ b/spec/services/telemetry/gather_spec.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Telemetry::Gather do + let!(:user) { create(:user, last_sign_in_at: Time.zone.today) } + + describe '#call' do + subject(:gather) { described_class.new.call } + + it 'returns a hash with measurement, timestamp, tags, and fields' do + expect(gather).to include(:measurement, :timestamp, :tags, :fields) + end + + it 'includes the correct measurement' do + expect(gather[:measurement]).to eq('dawarich_usage_metrics') + end + + it 'includes the current timestamp' do + expect(gather[:timestamp]).to be_within(1).of(Time.current.to_i) + end + + it 'includes the correct instance_id in tags' do + expect(gather[:tags][:instance_id]).to eq(Digest::SHA2.hexdigest(user.api_key)) + end + + it 'includes the correct app_version in fields' do + expect(gather[:fields][:app_version]).to eq("\"#{APP_VERSION}\"") + end + + it 'includes the correct dau in fields' do + expect(gather[:fields][:dau]).to eq(1) + end + + context 'with a custom measurement' do + let(:measurement) { 'custom_measurement' } + + subject(:gather) { described_class.new(measurement:).call } + + it 'includes the correct measurement' do + expect(gather[:measurement]).to eq('custom_measurement') + end + end + end +end diff --git a/spec/services/trips/photos_spec.rb b/spec/services/trips/photos_spec.rb new file mode 100644 index 00000000..abe9f52b --- /dev/null +++ b/spec/services/trips/photos_spec.rb @@ -0,0 +1,72 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Trips::Photos do + let(:user) { instance_double('User') } + let(:trip) { instance_double('Trip', started_at: Date.new(2024, 1, 1), ended_at: Date.new(2024, 1, 7)) } + let(:service) { described_class.new(trip, user) } + + describe '#call' do + context 'when user has no photo integrations configured' do + before do + allow(user).to receive(:immich_integration_configured?).and_return(false) + allow(user).to receive(:photoprism_integration_configured?).and_return(false) + end + + it 'returns an empty array' do + expect(service.call).to eq([]) + end + end + + context 'when user has photo integrations configured' do + let(:photo_search) { instance_double('Photos::Search') } + let(:raw_photos) do + [ + { + id: 1, + url: '/api/v1/photos/1/thumbnail.jpg?api_key=test-api-key&source=immich', + source: 'immich', + orientation: 'landscape' + }, + { + id: 2, + url: '/api/v1/photos/2/thumbnail.jpg?api_key=test-api-key&source=photoprism', + source: 'photoprism', + orientation: 'portrait' + } + ] + end + + before do + allow(user).to receive(:immich_integration_configured?).and_return(true) + allow(user).to receive(:photoprism_integration_configured?).and_return(false) + allow(user).to receive(:api_key).and_return('test-api-key') + + allow(Photos::Search).to receive(:new) + .with(user, start_date: '2024-01-01', end_date: '2024-01-07') + .and_return(photo_search) + allow(photo_search).to receive(:call).and_return(raw_photos) + end + + it 'returns formatted photo thumbnails' do + expected_result = [ + { + id: 1, + url: '/api/v1/photos/1/thumbnail.jpg?api_key=test-api-key&source=immich', + source: 'immich', + orientation: 'landscape' + }, + { + id: 2, + url: '/api/v1/photos/2/thumbnail.jpg?api_key=test-api-key&source=photoprism', + source: 'photoprism', + orientation: 'portrait' + } + ] + + expect(service.call).to eq(expected_result) + end + end + end +end diff --git a/spec/swagger/api/v1/photos_controller_spec.rb b/spec/swagger/api/v1/photos_controller_spec.rb index eb3cb737..16a9e85b 100644 --- a/spec/swagger/api/v1/photos_controller_spec.rb +++ b/spec/swagger/api/v1/photos_controller_spec.rb @@ -3,7 +3,7 @@ require 'swagger_helper' RSpec.describe 'Api::V1::PhotosController', type: :request do - let(:user) { create(:user, :with_immich_credentials) } + let(:user) { create(:user, :with_immich_integration) } let(:api_key) { user.api_key } let(:start_date) { '2024-01-01' } let(:end_date) { '2024-01-02' } @@ -103,59 +103,18 @@ RSpec.describe 'Api::V1::PhotosController', type: :request do type: :object, properties: { id: { type: :string }, - deviceAssetId: { type: :string }, - ownerId: { type: :string }, - type: { type: :string }, - originalPath: { type: :string }, - originalFileName: { type: :string }, - originalMimeType: { type: :string }, - thumbhash: { type: :string }, - fileCreatedAt: { type: :string, format: 'date-time' }, - fileModifiedAt: { type: :string, format: 'date-time' }, + latitude: { type: :number, format: :float }, + longitude: { type: :number, format: :float }, localDateTime: { type: :string, format: 'date-time' }, - updatedAt: { type: :string, format: 'date-time' }, - isFavorite: { type: :boolean }, - isArchived: { type: :boolean }, - isTrashed: { type: :boolean }, - duration: { type: :string }, - exifInfo: { - type: :object, - properties: { - make: { type: :string }, - model: { type: :string }, - exifImageWidth: { type: :integer }, - exifImageHeight: { type: :integer }, - fileSizeInByte: { type: :integer }, - orientation: { type: :string }, - dateTimeOriginal: { type: :string, format: 'date-time' }, - modifyDate: { type: :string, format: 'date-time' }, - timeZone: { type: :string }, - lensModel: { type: :string }, - fNumber: { type: :number, format: :float }, - focalLength: { type: :number, format: :float }, - iso: { type: :integer }, - exposureTime: { type: :string }, - latitude: { type: :number, format: :float }, - longitude: { type: :number, format: :float }, - city: { type: :string }, - state: { type: :string }, - country: { type: :string }, - description: { type: :string }, - projectionType: { type: %i[string null] }, - rating: { type: %i[integer null] } - } - }, - checksum: { type: :string }, - isOffline: { type: :boolean }, - hasMetadata: { type: :boolean }, - duplicateId: { type: :string }, - resized: { type: :boolean } + originalFileName: { type: :string }, + city: { type: :string }, + state: { type: :string }, + country: { type: :string }, + type: { type: :string, enum: %w[image video] }, + orientation: { type: :string, enum: %w[portrait landscape] }, + source: { type: :string, enum: %w[immich photoprism] } }, - required: %w[id deviceAssetId ownerId type originalPath - originalFileName originalMimeType thumbhash - fileCreatedAt fileModifiedAt localDateTime - updatedAt isFavorite isArchived isTrashed duration - exifInfo checksum isOffline hasMetadata duplicateId resized] + required: %w[id latitude longitude localDateTime originalFileName city state country type source] } run_test! do |response| @@ -172,61 +131,25 @@ RSpec.describe 'Api::V1::PhotosController', type: :request do produces 'application/json' parameter name: :id, in: :path, type: :string, required: true parameter name: :api_key, in: :query, type: :string, required: true - + parameter name: :source, in: :query, type: :string, required: true response '200', 'photo found' do schema type: :object, properties: { id: { type: :string }, - deviceAssetId: { type: :string }, - ownerId: { type: :string }, - type: { type: :string }, - originalPath: { type: :string }, - originalFileName: { type: :string }, - originalMimeType: { type: :string }, - thumbhash: { type: :string }, - fileCreatedAt: { type: :string, format: 'date-time' }, - fileModifiedAt: { type: :string, format: 'date-time' }, + latitude: { type: :number, format: :float }, + longitude: { type: :number, format: :float }, localDateTime: { type: :string, format: 'date-time' }, - updatedAt: { type: :string, format: 'date-time' }, - isFavorite: { type: :boolean }, - isArchived: { type: :boolean }, - isTrashed: { type: :boolean }, - duration: { type: :string }, - exifInfo: { - type: :object, - properties: { - make: { type: :string }, - model: { type: :string }, - exifImageWidth: { type: :integer }, - exifImageHeight: { type: :integer }, - fileSizeInByte: { type: :integer }, - orientation: { type: :string }, - dateTimeOriginal: { type: :string, format: 'date-time' }, - modifyDate: { type: :string, format: 'date-time' }, - timeZone: { type: :string }, - lensModel: { type: :string }, - fNumber: { type: :number, format: :float }, - focalLength: { type: :number, format: :float }, - iso: { type: :integer }, - exposureTime: { type: :string }, - latitude: { type: :number, format: :float }, - longitude: { type: :number, format: :float }, - city: { type: :string }, - state: { type: :string }, - country: { type: :string }, - description: { type: :string }, - projectionType: { type: %i[string null] }, - rating: { type: %i[integer null] } - } - }, - checksum: { type: :string }, - isOffline: { type: :boolean }, - hasMetadata: { type: :boolean }, - duplicateId: { type: :string }, - resized: { type: :boolean } + originalFileName: { type: :string }, + city: { type: :string }, + state: { type: :string }, + country: { type: :string }, + type: { type: :string, enum: %w[IMAGE VIDEO image video raw live animated] }, + orientation: { type: :string, enum: %w[portrait landscape] }, + source: { type: :string, enum: %w[immich photoprism] } } let(:id) { '7fe486e3-c3ba-4b54-bbf9-1281b39ed15c' } + let(:source) { 'immich' } run_test! do |response| data = JSON.parse(response.body) @@ -238,6 +161,7 @@ RSpec.describe 'Api::V1::PhotosController', type: :request do response '404', 'photo not found' do let(:id) { 'nonexistent' } let(:api_key) { user.api_key } + let(:source) { 'immich' } run_test! do |response| data = JSON.parse(response.body) diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml index 3ecfb855..9e6a57dd 100644 --- a/swagger/v1/swagger.yaml +++ b/swagger/v1/swagger.yaml @@ -347,130 +347,49 @@ paths: properties: id: type: string - deviceAssetId: - type: string - ownerId: - type: string - type: - type: string - originalPath: - type: string - originalFileName: - type: string - originalMimeType: - type: string - thumbhash: - type: string - fileCreatedAt: - type: string - format: date-time - fileModifiedAt: - type: string - format: date-time + latitude: + type: number + format: float + longitude: + type: number + format: float localDateTime: type: string format: date-time - updatedAt: + originalFileName: type: string - format: date-time - isFavorite: - type: boolean - isArchived: - type: boolean - isTrashed: - type: boolean - duration: + city: type: string - exifInfo: - type: object - properties: - make: - type: string - model: - type: string - exifImageWidth: - type: integer - exifImageHeight: - type: integer - fileSizeInByte: - type: integer - orientation: - type: string - dateTimeOriginal: - type: string - format: date-time - modifyDate: - type: string - format: date-time - timeZone: - type: string - lensModel: - type: string - fNumber: - type: number - format: float - focalLength: - type: number - format: float - iso: - type: integer - exposureTime: - type: string - latitude: - type: number - format: float - longitude: - type: number - format: float - city: - type: string - state: - type: string - country: - type: string - description: - type: string - projectionType: - type: - - string - - 'null' - rating: - type: - - integer - - 'null' - checksum: + state: type: string - isOffline: - type: boolean - hasMetadata: - type: boolean - duplicateId: + country: type: string - resized: - type: boolean + type: + type: string + enum: + - image + - video + orientation: + type: string + enum: + - portrait + - landscape + source: + type: string + enum: + - immich + - photoprism required: - id - - deviceAssetId - - ownerId - - type - - originalPath - - originalFileName - - originalMimeType - - thumbhash - - fileCreatedAt - - fileModifiedAt + - latitude + - longitude - localDateTime - - updatedAt - - isFavorite - - isArchived - - isTrashed - - duration - - exifInfo - - checksum - - isOffline - - hasMetadata - - duplicateId - - resized + - originalFileName + - city + - state + - country + - type + - source "/api/v1/photos/{id}/thumbnail": get: summary: Retrieves a photo @@ -487,6 +406,11 @@ paths: required: true schema: type: string + - name: source + in: query + required: true + schema: + type: string responses: '200': description: photo found @@ -497,107 +421,43 @@ paths: properties: id: type: string - deviceAssetId: - type: string - ownerId: - type: string - type: - type: string - originalPath: - type: string - originalFileName: - type: string - originalMimeType: - type: string - thumbhash: - type: string - fileCreatedAt: - type: string - format: date-time - fileModifiedAt: - type: string - format: date-time + latitude: + type: number + format: float + longitude: + type: number + format: float localDateTime: type: string format: date-time - updatedAt: + originalFileName: type: string - format: date-time - isFavorite: - type: boolean - isArchived: - type: boolean - isTrashed: - type: boolean - duration: + city: type: string - exifInfo: - type: object - properties: - make: - type: string - model: - type: string - exifImageWidth: - type: integer - exifImageHeight: - type: integer - fileSizeInByte: - type: integer - orientation: - type: string - dateTimeOriginal: - type: string - format: date-time - modifyDate: - type: string - format: date-time - timeZone: - type: string - lensModel: - type: string - fNumber: - type: number - format: float - focalLength: - type: number - format: float - iso: - type: integer - exposureTime: - type: string - latitude: - type: number - format: float - longitude: - type: number - format: float - city: - type: string - state: - type: string - country: - type: string - description: - type: string - projectionType: - type: - - string - - 'null' - rating: - type: - - integer - - 'null' - checksum: + state: type: string - isOffline: - type: boolean - hasMetadata: - type: boolean - duplicateId: + country: type: string - resized: - type: boolean + type: + type: string + enum: + - IMAGE + - VIDEO + - image + - video + - raw + - live + - animated + orientation: + type: string + enum: + - portrait + - landscape + source: + type: string + enum: + - immich + - photoprism '404': description: photo not found "/api/v1/points":