Full generation, file type cleanup

CHDataManagement/Model/Item/ItemId.swift

@@ -1,8 +1,6 @@
 
 struct ItemId {
 
-    let itemId: String
-
     let language: ContentLanguage
 
     let itemType: ItemType
@@ -11,16 +9,16 @@ struct ItemId {
 extension ItemId: Equatable {
 
     static func == (lhs: ItemId, rhs: ItemId) -> Bool {
-        lhs.itemId == rhs.itemId && lhs.language == rhs.language && lhs.itemType == rhs.itemType
+        lhs.language == rhs.language &&
+        lhs.itemType == rhs.itemType
     }
 }
 
 extension ItemId: Hashable {
 
     func hash(into hasher: inout Hasher) {
-        hasher.combine(itemId)
         hasher.combine(language)
-        hasher.combine(itemType)
+        hasher.combine(itemType.id)
     }
 }
 
@@ -30,9 +28,6 @@ extension ItemId: Comparable {
         guard lhs.itemType == rhs.itemType else {
             return lhs.itemType < rhs.itemType
         }
-        guard lhs.itemId == rhs.itemId else {
-            return lhs.itemId < rhs.itemId
-        }
         return lhs.language < rhs.language
     }
 }