From 00c09bb87024656f5adaa9c250ea70660f2eff5e Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 31 Aug 2021 12:35:14 -0700
Subject: [PATCH] Update all invocations of read_channel_metadata_from_db_file
 for dict return rather than object.

---
 .../management/commands/scanforcontent.py     |  2 +-
 kolibri/core/content/utils/channels.py        | 22 +++++++++----------
 kolibri/core/tasks/api.py                     |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/kolibri/core/content/management/commands/scanforcontent.py b/kolibri/core/content/management/commands/scanforcontent.py
index fa9c13ff55c..60e379d52a6 100644
--- a/kolibri/core/content/management/commands/scanforcontent.py
+++ b/kolibri/core/content/management/commands/scanforcontent.py
@@ -113,7 +113,7 @@ def database_file_is_newer(self, channel_id, disk_path):
             disk_channel = read_channel_metadata_from_db_file(disk_path)
             db_channel = ChannelMetadata.objects.get(id=channel_id)
             # the version in the primary database is older than the one on disk
-            return disk_channel.version > db_channel.version
+            return disk_channel["version"] > db_channel.version
         except DatabaseError:
             # problem with the database on disk; it can't be considered newer
             return False
diff --git a/kolibri/core/content/utils/channels.py b/kolibri/core/content/utils/channels.py
index 4a3a574e1b9..6c3ba0b7ea7 100644
--- a/kolibri/core/content/utils/channels.py
+++ b/kolibri/core/content/utils/channels.py
@@ -121,17 +121,17 @@ def get_channels_for_data_folder(datafolder):
             continue
         channel_data = {
             "path": path,
-            "id": channel.id,
-            "name": channel.name,
-            "description": channel.description,
-            "tagline": getattr(channel, "tagline", ""),
-            "thumbnail": channel.thumbnail,
-            "version": channel.version,
-            "root": channel.root_id,
-            "author": channel.author,
-            "last_updated": getattr(channel, "last_updated", None),
-            "lang_code": getattr(channel, "lang_code", None),
-            "lang_name": getattr(channel, "lang_name", None),
+            "id": channel["id"],
+            "name": channel["name"],
+            "description": channel["description"],
+            "tagline": channel.get("tagline", ""),
+            "thumbnail": channel["thumbnail"],
+            "version": channel["version"],
+            "root": channel["root_id"],
+            "author": channel["author"],
+            "last_updated": channel.get("last_updated"),
+            "lang_code": channel.get("lang_code"),
+            "lang_name": channel.get("lang_name"),
         }
         channels.append(channel_data)
     return channels
diff --git a/kolibri/core/tasks/api.py b/kolibri/core/tasks/api.py
index c4b7ddbc5da..7c236ef0ec2 100644
--- a/kolibri/core/tasks/api.py
+++ b/kolibri/core/tasks/api.py
@@ -927,7 +927,7 @@ def channeldiffstats(self, request):
             channel_metadata = read_channel_metadata_from_db_file(
                 get_content_database_file_path(channel_id, drive.datafolder)
             )
-            job_metadata["new_channel_version"] = channel_metadata.version
+            job_metadata["new_channel_version"] = channel_metadata["version"]
         else:
             raise serializers.ValidationError(
                 "'method' field should either be 'network' or 'disk'."