Merged CoreDataStorage

1Weather.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>OneWeatherNotificationServiceExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>53</integer>
+			<integer>55</integer>
 		</dict>
 		<key>PG (Playground) 1.xcscheme</key>
 		<dict>

1Weather.xcworkspace/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -9,21 +9,21 @@
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>42</integer>
+			<integer>56</integer>
 		</dict>
 		<key>PG (Playground) 2.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>43</integer>
+			<integer>57</integer>
 		</dict>
 		<key>PG (Playground) 3.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>44</integer>
+			<integer>58</integer>
 		</dict>
 		<key>PG (Playground) 4.xcscheme</key>
 		<dict>
@@ -51,7 +51,7 @@
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>54</integer>
 		</dict>
 	</dict>
 </dict>

CoreDataStorage/CoreDataStorage.xcodeproj/project.pbxproj

@@ -35,6 +35,7 @@
 		CD3884512657BA550070FD6F /* _CoreDailyWeather.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD3884312657BA410070FD6F /* _CoreDailyWeather.swift */; };
 		CD3884522657BA550070FD6F /* _CoreNotifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD3884322657BA410070FD6F /* _CoreNotifications.swift */; };
 		CD3884532657BA550070FD6F /* _CoreNWSAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD3884332657BA410070FD6F /* _CoreNWSAlert.swift */; };
+		CD8EA914265D42E2000D3D63 /* 1WModel.xcdatamodeld in Resources */ = {isa = PBXBuildFile; fileRef = CD3884372657BA420070FD6F /* 1WModel.xcdatamodeld */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -278,6 +279,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CD8EA914265D42E2000D3D63 /* 1WModel.xcdatamodeld in Resources */,
 				CD38843C2657BA430070FD6F /* regenerate_objects.sh in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

CoreDataStorage/CoreDataStorage/CoreDataStorage.swift

@@ -16,7 +16,14 @@ public class CoreDataStorage: Storage {
         persistentContainer.newBackgroundContext()
     }()
     private lazy var persistentContainer: NSPersistentContainer = {
-        let container = NSPersistentContainer(name: "1WModel")
+        guard
+            let modelURL = Bundle(for: CoreDataStorage.self).url(forResource: "1WModel", withExtension: "momd"),
+            let managedObjectModel = NSManagedObjectModel(contentsOf: modelURL)
+        else {
+            return NSPersistentContainer(name: "1WModel")
+        }
+        
+        let container = NSPersistentContainer(name: "1WModel", managedObjectModel: managedObjectModel)
         container.loadPersistentStores { [weak self] (description, error) in
             if let error = error {
                 self?.log.error("Error loading persistent stores: \(error)")