Merge pull request #94 from SageSeekerSociety/dev

Release: 0.7.0

.github/dependabot.yml

@@ -3,19 +3,19 @@ updates:
   - package-ecosystem: 'maven'
     directory: '/'
     schedule:
-      interval: 'monthly'
+      interval: 'daily'
 
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:
-      interval: 'monthly'
+      interval: 'daily'
 
   - package-ecosystem: 'docker'
     directory: '/'
     schedule:
-      interval: 'monthly'
+      interval: 'daily'
 
   - package-ecosystem: 'devcontainers'
     directory: '/'
     schedule:
-      interval: 'monthly'
+      interval: 'daily'

design/API/NT-API.yml

@@ -631,7 +631,7 @@ paths:
                 rank:
                   type: integer
                 approved:
-                  type: boolean
+                  $ref: '#/components/schemas/ApproveType'
                 rejectReason:
                   type: string
       summary: Update Task
@@ -686,7 +686,7 @@ paths:
           name: team
           description: Team ID
         - schema:
-            type: boolean
+            $ref: '#/components/schemas/ApproveType'
           in: query
           name: approved
           description: Distinguish task status 
@@ -794,7 +794,6 @@ paths:
                 deadline:
                   type: integer
                   format: int64
-                  default: null
                 defaultDeadline:
                   type: integer
                   format: int64
@@ -2139,7 +2138,7 @@ components:
         rank:
           type: integer
         approved:
-          type: boolean
+          $ref: '#/components/schemas/ApproveType'
         rejectReason:
           type: string
     TaskSubmitterType:

design/DB/CREATE.sql

@@ -162,7 +162,9 @@ CREATE
 CREATE
     TABLE
         task(
-            approved BOOLEAN NOT NULL,
+            approved SMALLINT NOT NULL CHECK(
+                approved BETWEEN 0 AND 2
+            ),
             "creator_id" INTEGER NOT NULL,
             editable BOOLEAN NOT NULL,
             RANK INTEGER,
@@ -181,7 +183,7 @@ CREATE
             description TEXT NOT NULL,
             intro VARCHAR(255) NOT NULL,
             name VARCHAR(255) NOT NULL,
-            reject_reason VARCHAR(255),
+            reject_reason VARCHAR(255) NOT NULL,
             PRIMARY KEY(id)
         );
 

design/DB/MIGRATION/MIGRATE_TO_0_7_0_FROM_0_6_0.sql

@@ -0,0 +1,34 @@
+-- PostgreSQL Migration Script for Cheese Backend NT (0.6.0 -> 0.7.0)
+-- Backup Before Executing This in Production Database
+
+ALTER TABLE task
+    ALTER COLUMN approved SET DATA TYPE SMALLINT USING
+        CASE
+            WHEN approved = TRUE THEN 0
+            WHEN approved = FALSE THEN 1
+            END;
+
+ALTER TABLE task
+    ALTER COLUMN approved SET NOT NULL;
+
+ALTER TABLE task
+    ADD CONSTRAINT approved_check CHECK (approved BETWEEN 0 AND 2);
+
+UPDATE task
+SET reject_reason = ''
+WHERE reject_reason IS NULL;
+
+ALTER TABLE task
+    ALTER COLUMN reject_reason SET NOT NULL;
+
+UPDATE task
+SET approved =
+        CASE
+            WHEN approved = 0 THEN 0
+            WHEN approved = 1 AND reject_reason != '' THEN 1
+            ELSE 2
+            END;
+
+
+
+

design/DB/PATCH/PATCH_0_5_0_ANNOUNCEMENT_AND_TEMPLATE.sql

@@ -0,0 +1,15 @@
+-- PostgreSQL Patch Script for Cheese Backend NT (0.5.0)
+-- Backup Before Executing This in Production Database
+
+-- Description:
+-- Replace all invalid announcements and templates with "[]"
+
+-- This script can be executed several times safely without any side effects.
+
+UPDATE SPACE
+    SET announcements = '[]'
+    WHERE announcements NOT LIKE '[%]';
+
+UPDATE SPACE
+    SET task_templates = '[]'
+    WHERE task_templates NOT LIKE '[%]';

pom.xml

@@ -6,14 +6,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
         <relativePath/>
     </parent>
 
     <!-- Project Info -->
     <groupId>org.rucca</groupId>
     <artifactId>cheese</artifactId>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
     <name>backend</name>
     <description>Backend for Cheese Web Application</description>
     <url/>
@@ -31,7 +31,7 @@
     </scm>
     <properties>
         <java.version>21</java.version>
-        <kotlin.version>2.0.20</kotlin.version>
+        <kotlin.version>2.0.21</kotlin.version>
     </properties>
 
     <!-- Project Dependencies -->
@@ -136,23 +136,23 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>3.1.8</version>
+            <version>3.1.9</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
-            <version>3.1.8</version>
+            <version>3.1.9</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-multipart</artifactId>
-            <version>3.1.8</version>
+            <version>3.1.9</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.inject</groupId>
             <artifactId>jersey-hk2</artifactId>
-            <version>3.1.8</version>
+            <version>3.1.9</version>
         </dependency>
         <dependency>
             <groupId>org.parboiled</groupId>
@@ -194,14 +194,14 @@
                     <dependency>
                         <groupId>org.jetbrains.kotlin</groupId>
                         <artifactId>kotlin-maven-noarg</artifactId>
-                        <version>2.0.20</version>
+                        <version>2.0.21</version>
                     </dependency>
                 </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
-                <version>7.8.0</version>
+                <version>7.9.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -287,7 +287,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.5.1</version>
                 <configuration>
                     <systemPropertyVariables>
                         <spring.jpa.hibernate.ddl-auto>update</spring.jpa.hibernate.ddl-auto>

src/main/kotlin/org/rucca/cheese/api/SpacesApi.kt

@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.8.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.9.0).
  * https://openapi-generator.tech Do not edit the class manually.
  */
 package org.rucca.cheese.api

src/main/kotlin/org/rucca/cheese/api/TasksApi.kt

@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.8.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.9.0).
  * https://openapi-generator.tech Do not edit the class manually.
  */
 package org.rucca.cheese.api
@@ -331,10 +331,13 @@ interface TasksApi {
         @Valid
         @RequestParam(value = "team", required = false)
         team: kotlin.Int?,
-        @Parameter(description = "Distinguish task status")
+        @Parameter(
+            description = "Distinguish task status",
+            schema = Schema(allowableValues = ["APPROVED", "DISAPPROVED", "NONE"])
+        )
         @Valid
         @RequestParam(value = "approved", required = false)
-        approved: kotlin.Boolean?,
+        approved: ApproveTypeDTO?,
         @Parameter(description = "Owner's User ID")
         @Valid
         @RequestParam(value = "owner", required = false)

src/main/kotlin/org/rucca/cheese/api/TeamsApi.kt

@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.8.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.9.0).
  * https://openapi-generator.tech Do not edit the class manually.
  */
 package org.rucca.cheese.api

src/main/kotlin/org/rucca/cheese/auth/CustomAuthLogics.kt

@@ -46,7 +46,20 @@ class CustomAuthLogics {
         customLogicData: Any?,
     ): Boolean {
         val handler = logics[name] ?: throw RuntimeException("Custom auth logic '$name' not found.")
-        return handler(
+        val result =
+            handler(
+                userId,
+                action,
+                resourceType,
+                resourceId,
+                authInfo,
+                resourceOwnerIdGetter,
+                customLogicData
+            )
+        logger.debug(
+            "Invoked custom auth logic '{}'. Result: {}, userId: {}, action: {}, resourceType: {}, resourceId: {}, authInfo: {}, resourceOwnerIdGetter: {}, customLogicData: {}",
+            name,
+            result,
             userId,
             action,
             resourceType,
@@ -55,6 +68,7 @@ class CustomAuthLogics {
             resourceOwnerIdGetter,
             customLogicData
         )
+        return result
     }
 
     fun evaluate(
@@ -80,8 +94,10 @@ class CustomAuthLogics {
             root = result.parseTreeRoot.getValue()
         }
         if (root !is CustomAuthLogicsVariableNode)
-            logger.info(
-                "Parsed complex custom auth logic expression. Original: '$expression', parsed: $root"
+            logger.debug(
+                "Parsed complex custom auth logic expression. Original: '{}', parsed: {}",
+                expression,
+                root
             )
         fun evaluator(node: CustomAuthLogicsExpressionNode): Boolean {
             return when (node) {

src/main/kotlin/org/rucca/cheese/common/error/GlobalErrorHandler.kt

@@ -3,6 +3,7 @@ package org.rucca.cheese.common.error
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.http.converter.HttpMessageConversionException
 import org.springframework.web.bind.MissingServletRequestParameterException
 import org.springframework.web.bind.annotation.ControllerAdvice
 import org.springframework.web.bind.annotation.ExceptionHandler
@@ -36,6 +37,17 @@ class GlobalErrorHandler {
             .body(BadRequestError(e.message ?: "Method argument type mismatch"))
     }
 
+    @ExceptionHandler(HttpMessageConversionException::class)
+    @ResponseBody
+    fun handleHttpMessageConversionException(
+        e: HttpMessageConversionException
+    ): ResponseEntity<BaseError> {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+            .body(
+                BadRequestError(e.message ?: "Invalid request caused http message conversion error")
+            )
+    }
+
     @ExceptionHandler(Exception::class)
     @ResponseBody
     fun handleException(e: Exception): ResponseEntity<BaseError> {

src/main/kotlin/org/rucca/cheese/common/persistent/ApproveType.kt

@@ -0,0 +1,35 @@
+package org.rucca.cheese.common.persistent
+
+import org.rucca.cheese.model.ApproveTypeDTO
+
+/*
+ *
+ *  Do not delete any row of this enum,
+ *  because it is stored in database as an integer.
+ *
+ *  If you want to add a new row, add it to the end of the enum.
+ *  This will prevent changing the values of the existing rows.
+ *
+ */
+
+enum class ApproveType {
+    APPROVED,
+    DISAPPROVED,
+    NONE,
+}
+
+fun ApproveType.convert(): ApproveTypeDTO {
+    return when (this) {
+        ApproveType.APPROVED -> ApproveTypeDTO.APPROVED
+        ApproveType.DISAPPROVED -> ApproveTypeDTO.DISAPPROVED
+        ApproveType.NONE -> ApproveTypeDTO.NONE
+    }
+}
+
+fun ApproveTypeDTO.convert(): ApproveType {
+    return when (this) {
+        ApproveTypeDTO.APPROVED -> ApproveType.APPROVED
+        ApproveTypeDTO.DISAPPROVED -> ApproveType.DISAPPROVED
+        ApproveTypeDTO.NONE -> ApproveType.NONE
+    }
+}

src/main/kotlin/org/rucca/cheese/model/PatchTaskRequestDTO.kt

@@ -54,9 +54,10 @@ data class PatchTaskRequestDTO(
     @Schema(example = "null", description = "")
     @get:JsonProperty("rank")
     val rank: kotlin.Int? = null,
+    @field:Valid
     @Schema(example = "null", description = "")
     @get:JsonProperty("approved")
-    val approved: kotlin.Boolean? = null,
+    val approved: ApproveTypeDTO? = null,
     @Schema(example = "null", description = "")
     @get:JsonProperty("rejectReason")
     val rejectReason: kotlin.String? = null

src/main/kotlin/org/rucca/cheese/model/TaskDTO.kt

@@ -91,9 +91,10 @@ data class TaskDTO(
     @Schema(example = "null", description = "")
     @get:JsonProperty("rank")
     val rank: kotlin.Int? = null,
+    @field:Valid
     @Schema(example = "null", description = "")
     @get:JsonProperty("approved")
-    val approved: kotlin.Boolean? = null,
+    val approved: ApproveTypeDTO? = null,
     @Schema(example = "null", description = "")
     @get:JsonProperty("rejectReason")
     val rejectReason: kotlin.String? = null