Merge pull request #488 from photonia-io/impressionist-fixes

Impressionist fixes

app/controllers/graphql_controller.rb

@@ -10,6 +10,8 @@ class GraphqlController < ApplicationController
   # protect_from_forgery with: :null_session
 
   def execute
+    session[:dummy] = true
+
     query = params[:query]
     variables = prepare_variables(params[:variables])
     operation_name = params[:operationName]

app/graphql/graphql_query_collection.rb

@@ -136,7 +136,7 @@ class GraphqlQueryCollection
           extralargeImageUrl: imageUrl(type: "extralarge")
           dateTaken
           importedAt
-          impressions
+          impressionsCount
           previousPhoto {
             id
             name

app/graphql/types/photo_type.rb

@@ -10,7 +10,7 @@ class PhotoType < Types::BaseObject
     field :description, String, 'Description', null: false
     field :id, String, 'ID of the photo', null: false
     field :imported_at, GraphQL::Types::ISO8601DateTime, 'Datetime the photo was imported', null: true
-    field :impressions, Integer, 'Number of impressions', null: true
+    field :impressions_count, Integer, 'Number of impressions', null: true
     field :intelligent_thumbnail, IntelligentThumbnailType, 'Intelligent thumbnail', null: true
     field :labels, [LabelType], 'Labels', null: true
     field :license, String, 'License type of the photo', null: true
@@ -68,8 +68,9 @@ def image_url(type:)
       end
     end
 
-    def impressions
-      @object.impressions_count.zero? ? 1 : @object.impressions_count
+    def impressions_count
+      total_impressions_count = @object.impressions_count + @object.flickr_impressions_count
+      total_impressions_count.zero? ? 1 : total_impressions_count
     end
 
     def rekognition_label_model_version

app/graphql/types/query_type.rb

@@ -64,29 +64,29 @@ class QueryType < GraphQL::Schema::Object
     # Photos
 
     def photos(page: nil, query: nil)
-      pagy, @photos = context[:pagy].call(
+      pagy, photos = context[:pagy].call(
         query.present? ? Photo.search(query) : Photo.all.order(imported_at: :desc),
         page:
       )
-      @photos.define_singleton_method(:total_pages) { pagy.pages }
-      @photos.define_singleton_method(:current_page) { pagy.page }
-      @photos.define_singleton_method(:limit_value) { pagy.items }
-      @photos.define_singleton_method(:total_count) { pagy.count }
-      @photos
+      photos.define_singleton_method(:total_pages) { pagy.pages }
+      photos.define_singleton_method(:current_page) { pagy.page }
+      photos.define_singleton_method(:limit_value) { pagy.items }
+      photos.define_singleton_method(:total_count) { pagy.count }
+      photos
     end
 
     def photo(id:)
-      @photo = Photo.includes(:albums).includes(:albums_photos).friendly.find(id)
-      # context[:impressionist].call(@photo, 'graphql', unique: [:session_hash])
-      @photo
+      photo = Photo.includes(:albums).includes(:albums_photos).friendly.find(id)
+      context[:impressionist].call(photo, 'graphql', unique: [:session_hash])
+      photo
     end
 
     # Tags
 
     def tag(id:)
-      @tag = ActsAsTaggableOn::Tag.friendly.find(id)
-      # context[:impressionist].call(@tag, 'graphql', unique: [:session_hash])
-      @tag
+      tag = ActsAsTaggableOn::Tag.friendly.find(id)
+      context[:impressionist].call(tag, 'graphql', unique: [:session_hash])
+      tag
     end
 
     def most_used_user_tags
@@ -108,25 +108,25 @@ def least_used_machine_tags
     # Albums
 
     def albums(page: nil)
-      pagy, @albums = context[:pagy].call(Album.includes(:albums_photos, :photos).order(created_at: :desc), page:)
-      @albums.define_singleton_method(:total_pages) { pagy.pages }
-      @albums.define_singleton_method(:current_page) { pagy.page }
-      @albums.define_singleton_method(:limit_value) { pagy.items }
-      @albums.define_singleton_method(:total_count) { pagy.count }
-      @albums
+      pagy, albums = context[:pagy].call(Album.includes(:albums_photos, :photos).order(created_at: :desc), page:)
+      albums.define_singleton_method(:total_pages) { pagy.pages }
+      albums.define_singleton_method(:current_page) { pagy.page }
+      albums.define_singleton_method(:limit_value) { pagy.items }
+      albums.define_singleton_method(:total_count) { pagy.count }
+      albums
     end
 
     def album(id:)
-      @album = Album.includes(:albums_photos).friendly.find(id)
-      # context[:impressionist].call(@album, 'graphql', unique: [:session_hash])
-      @album
+      album = Album.includes(:albums_photos).friendly.find(id)
+      context[:impressionist].call(album, 'graphql', unique: [:session_hash])
+      album
     end
 
     # Homepage
 
     def latest_photo
       latest_photo = object ? object[:latest_photo] : Photo.order(imported_at: :desc).first
-      # context[:impressionist].call(latest_photo, 'graphql', unique: [:session_hash])
+      context[:impressionist].call(latest_photo, 'graphql', unique: [:session_hash])
       latest_photo
     end
 

app/javascript/photos/photo-info.vue

@@ -8,7 +8,7 @@
       <!-- display views -->
       <span class="icon"><i class="fas fa-eye"></i></span>
       <span class="has-text-weight-semibold">Views:</span>
-      <span v-if="!loading" class="ml-1">{{ photo.impressions }}</span>
+      <span v-if="!loading" class="ml-1">{{ photo.impressionsCount }}</span>
     </span>
     <span class="icon-text is-size-7">
       <span class="icon"><i class="fas fa-camera"></i></span>
@@ -50,4 +50,4 @@
   function momentFormat(date) {
     return moment(date).format(format)
   }
-</script>
+</script>

app/models/album.rb

@@ -4,15 +4,15 @@
 #
 # Table name: albums
 #
-#  id                :bigint           not null, primary key
-#  description       :text
-#  flickr_views      :integer
-#  impressions_count :integer          default(0), not null
-#  serial_number     :bigint
-#  slug              :string
-#  title             :string
-#  created_at        :datetime         not null
-#  updated_at        :datetime         not null
+#  id                       :bigint           not null, primary key
+#  description              :text
+#  flickr_impressions_count :integer          default(0), not null
+#  impressions_count        :integer          default(0), not null
+#  serial_number            :bigint
+#  slug                     :string
+#  title                    :string
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
 #
 class Album < ApplicationRecord
   is_impressionable counter_cache: true, unique: :session_hash

app/models/photo.rb

@@ -4,28 +4,28 @@
 #
 # Table name: photos
 #
-#  id                   :bigint           not null, primary key
-#  date_taken           :datetime
-#  description          :text
-#  exif                 :jsonb
-#  flickr_faves         :integer
-#  flickr_json          :jsonb
-#  flickr_original      :string
-#  flickr_photopage     :string
-#  flickr_views         :integer
-#  image_data           :jsonb
-#  imported_at          :datetime
-#  impressions_count    :integer          default(0), not null
-#  license              :string
-#  name                 :string
-#  privacy              :enum             default("public")
-#  rekognition_response :jsonb
-#  serial_number        :bigint           not null
-#  slug                 :string
-#  tsv                  :tsvector
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
-#  user_id              :bigint
+#  id                       :bigint           not null, primary key
+#  date_taken               :datetime
+#  description              :text
+#  exif                     :jsonb
+#  flickr_faves             :integer
+#  flickr_impressions_count :integer          default(0), not null
+#  flickr_json              :jsonb
+#  flickr_original          :string
+#  flickr_photopage         :string
+#  image_data               :jsonb
+#  imported_at              :datetime
+#  impressions_count        :integer          default(0), not null
+#  license                  :string
+#  name                     :string
+#  privacy                  :enum             default("public")
+#  rekognition_response     :jsonb
+#  serial_number            :bigint           not null
+#  slug                     :string
+#  tsv                      :tsvector
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  user_id                  :bigint
 #
 # Indexes
 #

db/migrate/20230410080718_rename_flickr_views_to_flickr_impressions_count.rb

@@ -0,0 +1,6 @@
+class RenameFlickrViewsToFlickrImpressionsCount < ActiveRecord::Migration[7.0]
+  def change
+    rename_column :photos, :flickr_views, :flickr_impressions_count
+    rename_column :albums, :flickr_views, :flickr_impressions_count
+  end
+end

db/migrate/20230410080845_change_flickr_impressions_count_to_not_null_default_0.rb

@@ -0,0 +1,8 @@
+class ChangeFlickrImpressionsCountToNotNullDefault0 < ActiveRecord::Migration[7.0]
+  def change
+    change_column_null :photos, :flickr_impressions_count, false, 0
+    change_column_null :albums, :flickr_impressions_count, false, 0
+    change_column_default :photos, :flickr_impressions_count, 0
+    change_column_default :albums, :flickr_impressions_count, 0
+  end
+end

db/structure.sql

@@ -61,7 +61,7 @@ CREATE TABLE public.albums (
     title character varying,
     description text,
     serial_number bigint,
-    flickr_views integer,
+    flickr_impressions_count integer DEFAULT 0 NOT NULL,
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL,
     impressions_count integer DEFAULT 0 NOT NULL
@@ -258,7 +258,7 @@ CREATE TABLE public.photos (
     license character varying,
     exif jsonb,
     serial_number bigint NOT NULL,
-    flickr_views integer,
+    flickr_impressions_count integer DEFAULT 0 NOT NULL,
     flickr_faves integer,
     imported_at timestamp without time zone,
     flickr_photopage character varying,
@@ -922,6 +922,8 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20230409165520'),
 ('20230409171752'),
 ('20230409171819'),
-('20230409184758');
+('20230409184758'),
+('20230410080718'),
+('20230410080845');
 
 

lib/capistrano/tasks/albums.rake

@@ -10,14 +10,4 @@ namespace :albums do
       end
     end
   end
-
-  task :copy_flickr_views_to_impressions_count do
-    on roles(:app) do
-      within current_path.to_s do
-        with rails_env: fetch(:stage).to_s do
-          execute :rake, 'albums:copy_flickr_views_to_impressions_count'
-        end
-      end
-    end
-  end
 end

lib/capistrano/tasks/photos.rake

@@ -14,14 +14,4 @@ namespace :photos do
       end
     end
   end
-
-  task :copy_flickr_views_to_impressions_count do
-    on roles(:app) do
-      within current_path.to_s do
-        with rails_env: fetch(:stage).to_s do
-          execute :rake, 'photos:copy_flickr_views_to_impressions_count'
-        end
-      end
-    end
-  end
 end

lib/tasks/albums.rake

@@ -10,11 +10,4 @@ namespace :albums do
       SQL
     )
   end
-
-  desc 'Copy flickr_views to impressions_count'
-  task copy_flickr_views_to_impressions_count: :environment do
-    Album.all.each do |album|
-      album.update(impressions_count: album.flickr_views)
-    end
-  end
 end

lib/tasks/flickr.rake

@@ -29,7 +29,7 @@ namespace :flickr do
           license: photo_hash['license'],
           exif: photo_hash['exif'],
           serial_number: photo_hash['id'],
-          flickr_views: photo_hash['count_views'],
+          flickr_impressions_count: photo_hash['count_views'],
           flickr_faves: photo_hash['count_faves'],
           imported_at: photo_hash['date_imported'],
           flickr_photopage: photo_hash['photopage'],
@@ -83,7 +83,7 @@ namespace :flickr do
       album = Album.find_or_create_by(serial_number: flickr_album['id']) do |a|
         a.title = flickr_album['title']
         a.description = flickr_album['description']
-        a.flickr_views = flickr_album['view_count']
+        a.flickr_impressions_count = flickr_album['view_count']
         a.created_at = DateTime.strptime(flickr_album['created'], '%s')
         a.updated_at = DateTime.strptime(flickr_album['last_updated'], '%s')
       end

lib/tasks/photos.rake

@@ -27,11 +27,4 @@ namespace :photos do
       end
     end
   end
-
-  desc 'Copy flickr_views to impressions_count'
-  task copy_flickr_views_to_impressions_count: :environment do
-    Photo.unscoped.all.each do |photo|
-      photo.update(impressions_count: photo.flickr_views)
-    end
-  end
 end

spec/factories/albums.rb

@@ -2,20 +2,20 @@
 #
 # Table name: albums
 #
-#  id                :bigint           not null, primary key
-#  description       :text
-#  flickr_views      :integer
-#  impressions_count :integer          default(0), not null
-#  serial_number     :bigint
-#  slug              :string
-#  title             :string
-#  created_at        :datetime         not null
-#  updated_at        :datetime         not null
+#  id                       :bigint           not null, primary key
+#  description              :text
+#  flickr_impressions_count :integer          default(0), not null
+#  impressions_count        :integer          default(0), not null
+#  serial_number            :bigint
+#  slug                     :string
+#  title                    :string
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
 #
 FactoryBot.define do
   factory :album do
     title { Faker::Lorem.sentence }
     description { Faker::Lorem.paragraph }
-    flickr_views { Faker::Number.number(digits: 5) }
+    flickr_impressions_count { Faker::Number.number(digits: 5) }
   end
 end