Fix to update UserEntity & Widget Http

hhhello0507 · Oct 10, 2024 · 5e3b74d · 5e3b74d
1 parent 6205313
commit 5e3b74d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...ver/src/main/kotlin/com/bestswlkh0310/graduating/graduatingserver/core/user/UserEntity.kt b/...ver/src/main/kotlin/com/bestswlkh0310/graduating/graduatingserver/core/user/UserEntity.kt
@@ -71,9 +71,12 @@ class UserEntity(
         if (nickname != null) {
             this.nickname = nickname
         }
-        if (graduatingYear != null && school?.type != null) {
-            val currentYear = LocalDateTime.now().year
-            this.graduatingYear = graduatingYear.coerceIn(currentYear + 1, currentYear + school.type.limit)
+        if (graduatingYear != null) {
+            val school = school ?: this.school
+            if (school?.type != null) {
+                val currentYear = LocalDateTime.now().year
+                this.graduatingYear = graduatingYear.coerceIn(currentYear + 1, currentYear + school.type.limit)
+            }
         }
         if (school != null) {
             this.school = school

diff --git a/Graduating-iOS/Graduating-Widget/Info.plist b/Graduating-iOS/Graduating-Widget/Info.plist
@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>