加上更新功能及跨境請求

src/main/kotlin/com/ray650128/pcredive/database/model/RecordData.kt

@@ -5,5 +5,5 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class RecordData(
     val member: Member,
-    var record: MemberRecord
+    var record: MemberRecord?
 )

src/main/kotlin/com/ray650128/pcredive/database/service/MemberRecordService.kt

@@ -21,6 +21,11 @@ object MemberRecordService {
         return recordCollection.findOne(MemberRecord::_id eq bsonId)
     }
 
+    fun findByMemberIdBetweenDate(id: String, start: Long, end: Long): MemberRecord? {
+        val bsonId: Id<Member> = ObjectId(id).toId()
+        return recordCollection.findOne(MemberRecord::memberId eq bsonId, MemberRecord::createdAt gte start, MemberRecord::createdAt lt end)
+    }
+
     fun findByTimeBetween(start: Long, end: Long): List<MemberRecord> {
         return recordCollection.find(MemberRecord::createdAt gte start, MemberRecord::createdAt lt end).toList()
     }

src/main/kotlin/com/ray650128/pcredive/plugins/HTTP.kt

@@ -7,11 +7,13 @@ import io.ktor.server.application.*
 fun Application.configureHTTP() {
     install(CORS) {
         allowMethod(HttpMethod.Options)
+        allowMethod(HttpMethod.Get)
         allowMethod(HttpMethod.Put)
-        allowMethod(HttpMethod.Delete)
+        //allowMethod(HttpMethod.Delete)
-        allowMethod(HttpMethod.Patch)
+        allowMethod(HttpMethod.Post)
-        allowHeader(HttpHeaders.Authorization)
         allowHeader(HttpHeaders.AccessControlAllowOrigin)
+        allowHeader(HttpHeaders.Accept)
+        allowHeader(HttpHeaders.ContentType)
         anyHost()
         allowCredentials = true
         allowNonSimpleContentTypes = true

src/main/kotlin/com/ray650128/pcredive/plugins/MemberRecordRouting.kt

@@ -21,6 +21,9 @@ import java.util.*
 
 fun Application.configureMemberRecordRouting() {
     routing {
+        options("{...}") {
+            call.respond(HttpStatusCode.OK)
+        }
         route("/api") {
             route("/record") {
                 get {
@@ -37,13 +40,33 @@ fun Application.configureMemberRecordRouting() {
                         call.respond(HttpStatusCode.NotFound)
                         return@post
                     }
-                    record.apply {
+
+                    val now = Calendar.getInstance()
+                    val startTime = getDayStartLong(now[Calendar.YEAR], now[Calendar.MONTH], now[Calendar.DAY_OF_MONTH])
+                    val endTime = getDayEndLong(now[Calendar.YEAR], now[Calendar.MONTH], now[Calendar.DAY_OF_MONTH])
+                    val existData = MemberRecordService.findByMemberIdBetweenDate(id, startTime, endTime) ?: run {
+                        record.apply {
+                            memberId = member._id
+                            createdAt = System.currentTimeMillis()
+                            updatedAt = System.currentTimeMillis()
+                        }
+                        MemberRecordService.create(record).let {
+                            call.respond(HttpStatusCode.OK, record)
+                        }
+                        return@post
+                    }
+                    existData.apply {
                         memberId = member._id
-                        createdAt = System.currentTimeMillis()
+                        record1 = record.record1
+                        record1c = record.record1c
+                        record2 = record.record2
+                        record2c = record.record2c
+                        record3 = record.record3
+                        record3c = record.record3c
                         updatedAt = System.currentTimeMillis()
                     }
-                    MemberRecordService.create(record).let {
+                    MemberRecordService.updateById(existData._id.toString(), existData).let {
-                        call.respond(HttpStatusCode.OK, record)
+                        call.respond(HttpStatusCode.OK, existData)
                     }
                 }
                 get("/{year}/{month}/{day}") {
@@ -86,26 +109,37 @@ fun Application.configureMemberRecordRouting() {
     }
 }
 
-fun getData(year: Int, month: Int, day: Int): List<RecordData> {
+fun getDayStartLong(year: Int, month: Int, day: Int): Long {
     val calendar = Calendar.getInstance().apply {
         set(Calendar.YEAR, year)
         set(Calendar.MONTH, month)
         set(Calendar.DAY_OF_MONTH, day)
     }
-    val startTime = calendar.apply {
+    return calendar.apply {
         set(Calendar.HOUR_OF_DAY, 5)
         set(Calendar.MINUTE, 0)
         set(Calendar.SECOND, 0)
         set(Calendar.MILLISECOND, 0)
     }.timeInMillis
-    val endTime = startTime + 86399000L
+}
+
+fun getDayEndLong(year: Int, month: Int, day: Int): Long {
+    val startTime = getDayStartLong(year, month, day)
+    return startTime + 86399000L
+}
+
+fun getData(year: Int, month: Int, day: Int): List<RecordData> {
+    val startTime = getDayStartLong(year, month, day)
+    val endTime = getDayEndLong(year, month, day)
     // Show a list of articles
     val records = ArrayList<RecordData>()
     val memberList = MemberService.findAll()
     memberList.forEach { member ->
-        records.add(
+        if (member.createAt!! < startTime && !member.leave) {
-            RecordData(member = member, MemberRecord())
+            records.add(
-        )
+                RecordData(member = member, null)
+            )
+        }
     }
     val recordList = MemberRecordService.findByTimeBetween(startTime, endTime)
     recordList.forEach { record ->

src/main/kotlin/com/ray650128/pcredive/plugins/MemberRouting.kt

@@ -16,6 +16,9 @@ import kotlinx.coroutines.coroutineScope
 
 fun Application.configureMemberRouting() {
     routing {
+        options("{...}") {
+            call.respond(HttpStatusCode.OK)
+        }
         route("/api") {
             route("/member") {
                 get {