fix: total score overwrite

joj3_config_generator/models/repo.py

@@ -1,6 +1,6 @@
 import os
 from pathlib import Path
-from typing import List, Optional
+from typing import List
 
 from pydantic import AliasChoices, BaseModel, Field, model_validator
 
@@ -32,8 +32,8 @@ class Config(BaseModel):
         "", validation_alias=AliasChoices("gitea-token", "gitea_token")
     )
     gitea_org: str = Field("", validation_alias=AliasChoices("gitea-org", "gitea_org"))
-    max_total_score: Optional[int] = Field(
+    max_total_score: int = Field(
-        None, validation_alias=AliasChoices("max-total-score", "max_total_score")
+        100, validation_alias=AliasChoices("max-total-score", "max_total_score")
     )
     force_skip_health_check_on_test: bool = Field(
         False,

joj3_config_generator/models/task.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timezone
 from enum import Enum
 from pathlib import Path
-from typing import Any, Dict, List, Type
+from typing import Any, Dict, List, Optional, Type
 
 from pydantic import (
     AliasChoices,
@@ -222,6 +222,6 @@ class Config(BaseModel):
     release: Release = Release()  # Release configuration
     stages: List[Stage] = []  # list of stage configurations
     groups: Groups = Groups()
-    max_total_score: int = Field(
+    max_total_score: Optional[int] = Field(
-        100, validation_alias=AliasChoices("max-total-score", "max_total_score")
+        None, validation_alias=AliasChoices("max-total-score", "max_total_score")
     )

joj3_config_generator/transformers/repo.py

@@ -33,9 +33,9 @@ def get_teapot_post_stage(
         repo_conf.grading_repo_name,
         "--max-total-score",
         (
-            str(repo_conf.max_total_score)
+            str(task_conf.max_total_score)
-            if repo_conf.max_total_score is not None
+            if task_conf.max_total_score is not None
-            else str(task_conf.max_total_score)
+            else str(repo_conf.max_total_score)
         ),
     ]
     if not repo_conf.submitter_in_issue_title:

tests/convert/basic/task.json

@@ -261,6 +261,7 @@
                     {
                         "name": "keyword",
                         "with": {
+                            "score": 0,
                             "matches": [
                                 {
                                     "keywords": [
@@ -369,6 +370,7 @@
                     {
                         "name": "clangtidy",
                         "with": {
+                            "score": 0,
                             "matches": [
                                 {
                                     "keywords": [
@@ -499,12 +501,14 @@
                     {
                         "name": "keyword",
                         "with": {
+                            "score": 0,
                             "matches": []
                         }
                     },
                     {
                         "name": "cppcheck",
                         "with": {
+                            "score": 0,
                             "matches": [
                                 {
                                     "keywords": [
@@ -527,6 +531,7 @@
                     {
                         "name": "clangtidy",
                         "with": {
+                            "score": 0,
                             "matches": []
                         }
                     },
@@ -552,6 +557,7 @@
                     {
                         "name": "cpplint",
                         "with": {
+                            "score": 0,
                             "matches": []
                         }
                     },
@@ -652,6 +658,7 @@
                     {
                         "name": "cpplint",
                         "with": {
+                            "score": 0,
                             "matches": [
                                 {
                                     "keywords": [

tests/convert/clang-tidy/task.json

@@ -78,6 +78,7 @@
                     {
                         "name": "clangtidy",
                         "with": {
+                            "score": 0,
                             "matches": [
                                 {
                                     "keywords": [

tests/convert/cppcheck/task.json

@@ -71,6 +71,7 @@
                     {
                         "name": "cppcheck",
                         "with": {
+                            "score": 0,
                             "matches": [
                                 {
                                     "keywords": [

tests/convert/cpplint/task.json

@@ -70,6 +70,7 @@
                     {
                         "name": "cpplint",
                         "with": {
+                            "score": 0,
                             "matches": [
                                 {
                                     "keywords": [

tests/convert/elf/task.json

@@ -74,6 +74,7 @@
                     {
                         "name": "elf",
                         "with": {
+                            "score": 0,
                             "matches": [
                                 {
                                     "keywords": [

tests/convert/keyword/task.json

@@ -73,6 +73,7 @@
                     {
                         "name": "keyword",
                         "with": {
+                            "score": 0,
                             "matches": [
                                 {
                                     "keywords": [