Removed duplicate Item Core Data files

Author: Andy-Wu12

Item+CoreDataClass.swift

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		92513759298C8DB600916591 /* Item+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92513757298C8DB600916591 /* Item+CoreDataClass.swift */; };
+		9251375A298C8DB600916591 /* Item+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92513758298C8DB600916591 /* Item+CoreDataProperties.swift */; };
 		92CCF02A2985FF120066A4A4 /* ItemEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92CCF0292985FF120066A4A4 /* ItemEditView.swift */; };
 		92E1884D297BB47C009BD0E4 /* PhotoSelectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92E1884C297BB47C009BD0E4 /* PhotoSelectorView.swift */; };
 		92E18851297C6F12009BD0E4 /* ItemDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92E18850297C6F12009BD0E4 /* ItemDetailView.swift */; };
@@ -27,13 +29,13 @@
 		92FA0B59297A399D00F12C85 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 92FA0B56297A399D00F12C85 /* README.md */; };
 		92FA0B5A297A399D00F12C85 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 92FA0B57297A399D00F12C85 /* LICENSE */; };
 		92FA0B5D297A3F5A00F12C85 /* iExpireProject.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 92FA0B5B297A3F5A00F12C85 /* iExpireProject.xcdatamodeld */; };
-		92FA0B6D297A4C7900F12C85 /* Item+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92FA0B6B297A4C7900F12C85 /* Item+CoreDataClass.swift */; };
-		92FA0B6E297A4C7900F12C85 /* Item+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92FA0B6C297A4C7900F12C85 /* Item+CoreDataProperties.swift */; };
 		92FA0B70297A531600F12C85 /* DataController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92FA0B6F297A531600F12C85 /* DataController.swift */; };
 		92FA0B72297A5D3C00F12C85 /* TrackedItemsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92FA0B71297A5D3C00F12C85 /* TrackedItemsView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		92513757298C8DB600916591 /* Item+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Item+CoreDataClass.swift"; sourceTree = "<group>"; };
+		92513758298C8DB600916591 /* Item+CoreDataProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Item+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		92CCF0292985FF120066A4A4 /* ItemEditView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemEditView.swift; sourceTree = "<group>"; };
 		92E1884B297BB04E009BD0E4 /* iExpire.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = iExpire.entitlements; sourceTree = "<group>"; };
 		92E1884C297BB47C009BD0E4 /* PhotoSelectorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoSelectorView.swift; sourceTree = "<group>"; };
@@ -56,8 +58,6 @@
 		92FA0B56297A399D00F12C85 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		92FA0B57297A399D00F12C85 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		92FA0B5C297A3F5A00F12C85 /* iExpireProject.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = iExpireProject.xcdatamodel; sourceTree = "<group>"; };
-		92FA0B6B297A4C7900F12C85 /* Item+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Item+CoreDataClass.swift"; sourceTree = SOURCE_ROOT; };
-		92FA0B6C297A4C7900F12C85 /* Item+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Item+CoreDataProperties.swift"; sourceTree = SOURCE_ROOT; };
 		92FA0B6F297A531600F12C85 /* DataController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataController.swift; sourceTree = "<group>"; };
 		92FA0B71297A5D3C00F12C85 /* TrackedItemsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackedItemsView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -155,8 +155,8 @@
 		92FA0B5E297A408500F12C85 /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				92FA0B6B297A4C7900F12C85 /* Item+CoreDataClass.swift */,
-				92FA0B6C297A4C7900F12C85 /* Item+CoreDataProperties.swift */,
+				92513757298C8DB600916591 /* Item+CoreDataClass.swift */,
+				92513758298C8DB600916591 /* Item+CoreDataProperties.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -238,6 +238,7 @@
 				92E188732984CB14009BD0E4 /* CSVDocument.swift in Sources */,
 				92E188662980D995009BD0E4 /* Notifications.swift in Sources */,
 				92E188622980900D009BD0E4 /* NotificationPermission.swift in Sources */,
+				9251375A298C8DB600916591 /* Item+CoreDataProperties.swift in Sources */,
 				92FA0B5D297A3F5A00F12C85 /* iExpireProject.xcdatamodeld in Sources */,
 				92FA0B70297A531600F12C85 /* DataController.swift in Sources */,
 				92FA0B49297A326F00F12C85 /* AddExpirationView.swift in Sources */,
@@ -246,11 +247,10 @@
 				92E1884D297BB47C009BD0E4 /* PhotoSelectorView.swift in Sources */,
 				92E1886429809063009BD0E4 /* SettingsView.swift in Sources */,
 				92E1885E297E52AE009BD0E4 /* ExpirationTextView.swift in Sources */,
+				92513759298C8DB600916591 /* Item+CoreDataClass.swift in Sources */,
 				92E1885C297E4D70009BD0E4 /* DateStringUtil.swift in Sources */,
 				92CCF02A2985FF120066A4A4 /* ItemEditView.swift in Sources */,
-				92FA0B6D297A4C7900F12C85 /* Item+CoreDataClass.swift in Sources */,
 				92FA0B47297A326F00F12C85 /* iExpireApp.swift in Sources */,
-				92FA0B6E297A4C7900F12C85 /* Item+CoreDataProperties.swift in Sources */,
 				92E18868298378A3009BD0E4 /* CoreDataUtil.swift in Sources */,
 				92FA0B72297A5D3C00F12C85 /* TrackedItemsView.swift in Sources */,
 			);

Item+CoreDataProperties.swift

@@ -16,13 +16,11 @@ extension Item {
         return NSFetchRequest<Item>(entityName: "Item")
     }
 
-    @NSManaged public var expirationDate: String?
-    @NSManaged public var image: Data?
     @NSManaged public var name: String?
+    @NSManaged public var expirationDate: String?
+    @NSManaged public var expirationDateTime: Date?
     @NSManaged public var notes: String?
-    @NSManaged public var expirationMonth: Int32
-    @NSManaged public var expirationDay: Int32
-    @NSManaged public var expirationYear: Int32
+    @NSManaged public var image: Data?
 
     public var wrappedName: String {
         name ?? "Unknown name"
@@ -36,15 +34,8 @@ extension Item {
         notes ?? ""
     }
 
-    public var expirationToDate: Date {
-        let dateNoCommas = expirationDate!.filter { $0 != "," }
-        
-        var components = DateComponents()
-        components.month = Int(expirationMonth)
-        components.day = Int(expirationDay)
-        components.year = Int(expirationYear)
-        
-        return Calendar.current.date(from: components)!
+    public var wrappedDateTime: Date {
+        expirationDateTime ?? Date.now
     }
 }