refactor: use ChallengeType in place of int

huyenltnguyen · huyenltnguyen · commit 8bedc8b8d307 · 2025-07-16T17:09:56.000+07:00
diff --git a/mobile-app/integration_test/test_runner/curriculum_tests.dart b/mobile-app/integration_test/test_runner/curriculum_tests.dart
@@ -213,7 +213,7 @@ void main() {
 
           Challenge challenge = Challenge.fromJson(currChallenge);
           print(
-              'Challenge: ${challenge.id} - ${challenge.title} - ${challenge.challengeTypeIndex}');
+              'Challenge: ${challenge.id} - ${challenge.title} - ${challenge.challengeType.index}');
 
           String getLines(String contents, [List? range]) {
             if (range == null || range.isEmpty) {
@@ -254,7 +254,7 @@ void main() {
                 babelWebView.webViewController,
                 testing: true,
               ),
-              'workerType': builder.getWorkerType(challenge.challengeTypeIndex),
+              'workerType': builder.getWorkerType(challenge.challengeType),
               'combinedCode': await builder.combinedCode(challenge),
               'editableRegionContent': editableRegion,
               'hooks': {
diff --git a/mobile-app/lib/models/learn/challenge_model.dart b/mobile-app/lib/models/learn/challenge_model.dart
@@ -1,11 +1,10 @@
 import 'package:freecodecamp/enums/ext_type.dart';
 
-// NOTE: For reference
 enum ChallengeType {
   html, // 0
   js, // 1
   backend, // 2
-  zipline, // 3 (frontEndProject is also 3 in main repo, but omitted to avoid duplicate enum values)
+  frontEndProject, // 3 (zipline is also 3 in main repo, but omitted to avoid duplicate enum values)
   backEndProject, // 4
   jsProject, // 5
   modern, // 6
@@ -113,9 +112,6 @@ class Challenge {
     required this.hooks,
   });
 
-  // Backward compatibility getter for challengeType as int
-  int get challengeTypeIndex => challengeType.index;
-
   factory Challenge.fromJson(Map<String, dynamic> data) {
     return Challenge(
       id: data['id'],
diff --git a/mobile-app/lib/models/learn/completed_challenge_model.dart b/mobile-app/lib/models/learn/completed_challenge_model.dart
@@ -4,7 +4,7 @@ class CompletedChallenge {
   final String id;
   final String? solution;
   final String? githubLink;
-  final int? challengeType;
+  final ChallengeType? challengeType;
   final DateTime completedDate;
   final List<ChallengeFile> files;
 
@@ -22,7 +22,9 @@ class CompletedChallenge {
       id: data['id'],
       solution: data['solution'],
       githubLink: data['githubLink'],
-      challengeType: data['challengeType'],
+      challengeType: data['challengeType'] != null
+          ? ChallengeType.values[data['challengeType']]
+          : null,
       completedDate: DateTime.fromMillisecondsSinceEpoch(data['completedDate']),
       files: (data['files'] as List)
           .map<ChallengeFile>((file) => ChallengeFile.fromJson(file))
diff --git a/mobile-app/lib/service/learn/learn_service.dart b/mobile-app/lib/service/learn/learn_service.dart
@@ -51,26 +51,26 @@ class LearnService {
     String? solutionLink,
   }) async {
     String challengeId = challenge.id;
-    int challengeType = challenge.challengeTypeIndex;
+    ChallengeType challengeType = challenge.challengeType;
 
     Response submitTypesRes = await _dio.get('$baseUrlV2/submit-types.json');
     Map<String, dynamic> submitTypes = submitTypesRes.data;
 
-    switch (submitTypes[challengeType.toString()]) {
+    switch (submitTypes[challengeType.index.toString()]) {
       case 'tests':
         late Map payload;
-        if (challengeType == 14 ||
+        if (challengeType == ChallengeType.multifileCertProject ||
             challenge.block ==
                 'javascript-algorithms-and-data-structures-projects') {
           payload = {
             'id': challengeId,
-            'challengeType': challengeType,
+            'challengeType': challengeType.index,
             'files': challengeFiles,
           };
         } else {
           payload = {
             'id': challengeId,
-            'challengeType': challengeType,
+            'challengeType': challengeType.index,
           };
         }
         Response res = await _dio.post(
@@ -91,7 +91,7 @@ class LearnService {
       case 'project.backEnd':
         Map payload = {
           'id': challengeId,
-          'challengeType': challengeType,
+          'challengeType': challengeType.index,
           'solution': solutionLink
         };
         Response res = await _dio.post(
diff --git a/mobile-app/lib/ui/views/learn/challenge/challenge_view.dart b/mobile-app/lib/ui/views/learn/challenge/challenge_view.dart
@@ -282,7 +282,7 @@ class ChallengeView extends StatelessWidget {
                       arguments: {
                         'userCode': '',
                         'workerType':
-                            builder.getWorkerType(challenge.challengeTypeIndex),
+                            builder.getWorkerType(challenge.challengeType),
                         'combinedCode': '',
                         'editableRegionContent': '',
                         'hooks': {
@@ -554,7 +554,8 @@ class ChallengeView extends StatelessWidget {
           model.scaffoldKey.currentState?.openEndDrawer();
         },
       ),
-      if (challenge.challengeTypeIndex != 1 && challenge.challengeTypeIndex != 26)
+      if (challenge.challengeType != ChallengeType.js &&
+          challenge.challengeType != ChallengeType.jsLab)
         _panelIconButton(
           isActive: model.showPreview,
           icon: Icons.remove_red_eye_outlined,
@@ -579,7 +580,7 @@ class ChallengeView extends StatelessWidget {
   }
 
   Widget testList(Challenge challenge, ChallengeViewModel model) {
-    log(challenge.challengeTypeIndex.toString());
+    log(challenge.challengeType.index.toString());
     return ListView.builder(
       shrinkWrap: true,
       physics: const ClampingScrollPhysics(),
diff --git a/mobile-app/lib/ui/views/learn/challenge/challenge_viewmodel.dart b/mobile-app/lib/ui/views/learn/challenge/challenge_viewmodel.dart
@@ -614,7 +614,8 @@ class ChallengeViewModel extends BaseViewModel {
     setTestConsoleMessages = ['<p>// running tests</p>'];
 
     // Get user code console messages
-    if (challenge!.challengeTypeIndex == 1 || challenge!.challengeTypeIndex == 26) {
+    if (challenge!.challengeType == ChallengeType.js ||
+        challenge!.challengeType == ChallengeType.jsLab) {
       final evalResult = await testController!.callAsyncJavaScript(
         functionBody: await builder.buildUserCode(
           challenge!,
@@ -638,7 +639,7 @@ class ChallengeViewModel extends BaseViewModel {
           challenge!,
           _babelWebView.webViewController,
         ),
-        'workerType': builder.getWorkerType(challenge!.challengeTypeIndex),
+        'workerType': builder.getWorkerType(challenge!.challengeType),
         'combinedCode': await builder.combinedCode(challenge!),
         'editableRegionContent': editableRegionContent,
         'hooks': {
diff --git a/mobile-app/lib/ui/views/learn/challenge/templates/template_view.dart b/mobile-app/lib/ui/views/learn/challenge/templates/template_view.dart
@@ -34,61 +34,60 @@ class ChallengeTemplateView extends StatelessWidget {
             if (snapshot.hasData) {
               Challenge challenge = snapshot.data!;
 
-              int challengeType = challenge.challengeTypeIndex;
               List<ChallengeListTile> tiles = block.challengeTiles;
               int challNum =
                   tiles.indexWhere((el) => el.id == challenge.id) + 1;
-              switch (challengeType) {
-                case 0:
-                case 1:
-                case 14:
-                case 20:
-                case 25:
-                case 26:
+              switch (challenge.challengeType) {
+                case ChallengeType.html:
+                case ChallengeType.js:
+                case ChallengeType.multifileCertProject:
+                case ChallengeType.python:
+                case ChallengeType.lab:
+                case ChallengeType.jsLab:
                   return ChallengeView(
                     challenge: challenge,
                     block: block,
                     isProject: tiles.length > 1,
                   );
-                case 8:
+                case ChallengeType.quiz:
                   return QuizView(
                     challenge: challenge,
                     block: block,
                   );
-                case 10:
+                case ChallengeType.pythonProject:
                   return PythonProjectView(
                     challenge: challenge,
                     block: block,
                   );
-                case 11:
+                case ChallengeType.video:
                   return PythonView(
                     challenge: challenge,
                     block: block,
                     currentChallengeNum: challNum,
                   );
-                case 15:
-                case 19:
+                case ChallengeType.theOdinProject:
+                case ChallengeType.multipleChoice:
                   return MultipleChoiceView(
                     challenge: challenge,
                     block: block,
                     currentChallengeNum: challNum,
                   );
-                case 21:
-                case 22:
+                case ChallengeType.dialogue:
+                case ChallengeType.fillInTheBlank:
                   return EnglishView(
                     challenge: challenge,
                     block: block,
                     currentChallengeNum: challNum,
                   );
-                case 24:
+                case ChallengeType.generic:
                   return ReviewView(
                     challenge: challenge,
                     block: block,
                   );
                 default:
                   return Center(
                     child: Text(
-                      'Unknown Challenge, info : ${challenge.challengeTypeIndex}',
+                      'Unknown Challenge, info : ${challenge.challengeType}',
                     ),
                   );
               }
diff --git a/mobile-app/lib/ui/views/learn/test_runner.dart b/mobile-app/lib/ui/views/learn/test_runner.dart
@@ -48,14 +48,14 @@ return testRes;
   }) async {
     String challengeFile = await fileService.getFirstFileFromCache(
       challenge,
-      getChallengeExt(challenge.challengeTypeIndex),
+      getChallengeExt(challenge.challengeType),
       testing: testing,
     );
 
-    switch (challenge.challengeTypeIndex) {
+    switch (challenge.challengeType) {
       // JS-only challenges
-      case 1:
-      case 26:
+      case ChallengeType.js:
+      case ChallengeType.jsLab:
         // TODO: Move to learn file service
         if (babelController == null) {
           throw Exception('Babel controller is required to transpile JS code.');
@@ -95,28 +95,28 @@ return testRes;
     }
   }
 
-  String getWorkerType(int challengeType) {
+  String getWorkerType(ChallengeType challengeType) {
     switch (challengeType) {
-      case 0:
-      case 14:
-      case 25:
+      case ChallengeType.html:
+      case ChallengeType.multifileCertProject:
+      case ChallengeType.lab:
         return 'dom';
-      case 1:
-      case 26:
+      case ChallengeType.js:
+      case ChallengeType.jsLab:
         return 'javascript';
-      case 20:
-      case 23:
+      case ChallengeType.python:
+      case ChallengeType.multifilePythonCertProject:
         return 'python';
+      default:
+        return 'dom';
     }
-
-    return 'dom';
   }
 
-  Ext getChallengeExt(int challengeType) {
+  Ext getChallengeExt(ChallengeType challengeType) {
     switch (challengeType) {
       // JS-only challenges
-      case 1:
-      case 26:
+      case ChallengeType.js:
+      case ChallengeType.jsLab:
         return Ext.js;
       default:
         return Ext.html;
