Merge pull request #105 from fga-eps-mds/feat#69/ingressar_disciplinas

Feat#69/ingressar disciplinas
fga-eps-mds · Feb 1, 2025 · 7bb9f93 · 7bb9f93
2 parents d8f256e + 1d41d6f
commit 7bb9f93
Show file tree

Hide file tree

Showing 14 changed files with 293 additions and 59 deletions.
diff --git a/lib/core/di/locator.dart b/lib/core/di/locator.dart
@@ -10,6 +10,7 @@ import 'package:aranduapp/ui/onboarding/di/di_onboarding.dart';
 import 'package:aranduapp/ui/profile/di/di_profile.dart';
 import 'package:aranduapp/ui/recover_account/di/di_recover_account.dart';
 import 'package:aranduapp/ui/register_account/di/di_register_account.dart';
+import 'package:aranduapp/ui/join_subjects/di/di_join_subjects.dart';
 import 'package:aranduapp/ui/subjects/di/di.dart';
 import 'package:get_it/get_it.dart';
 
@@ -29,4 +30,5 @@ void setupLocator() {
   setupContentDI();
   setupAuthDI();
   setupEditDeleteUser();
+  setupJoinSubjectsDI();
 }
diff --git a/lib/core/network/studio_maker_api.dart b/lib/core/network/studio_maker_api.dart
@@ -1,4 +1,3 @@
-
 import 'package:aranduapp/core/log/log.dart';
 import 'package:dio/dio.dart';
 
@@ -14,7 +13,6 @@ class StudioMakerApi {
     _dio.options.connectTimeout = const Duration(seconds: 5);
     _dio.options.receiveTimeout = const Duration(seconds: 5);
 
-
     _dio.interceptors.add(LogInterceptor(
         requestBody: true,
         responseBody: true,
@@ -25,7 +23,7 @@ class StudioMakerApi {
   }
 
   static StudioMakerApi getInstance() {
-      return _instance ??= StudioMakerApi._internal();
+    return _instance ??= StudioMakerApi._internal();
   }
 
   Future<Response> get(

diff --git a/lib/core/network/token_manager/service/auth_service.dart b/lib/core/network/token_manager/service/auth_service.dart
@@ -34,11 +34,11 @@ class AuthService {
   }
 
   Future<UserModel> getUser() async {
-    String? json = await StorageValue.getInstance().getJsonUser();
+   // String? json = await StorageValue.getInstance().getJsonUser();
 
-    if (json != null) {
-      return UserModel.fromJsonString(json);
-    } else {
+   // if (json != null) {
+   //   return UserModel.fromJsonString(json);
+   // } else {
       final response = await validateToken();
 
       Log.f(response);
@@ -52,6 +52,6 @@ class AuthService {
       await StorageValue.getInstance().setJsonUser(user.toJson());
 
       return user;
-    }
+    //}
   }
 }
diff --git a/lib/core/state/command.dart b/lib/core/state/command.dart
@@ -1,3 +1,4 @@
+import 'package:aranduapp/core/log/log.dart';
 import 'package:async/async.dart';
 import 'package:flutter/material.dart';
 
@@ -40,11 +41,12 @@ abstract class Command<T> extends ChangeNotifier {
 
       if (_result?.asError != null) {
         _isError = true;
+        Log.i(_result?.asError!.error.toString());
       } else {
         _isOk = true;
       }
-
     } catch (e) {
+      Log.i(e);
       _result = Result.error(e);
       _isError = true;
     } finally {

diff --git a/lib/ui/join_subjects/di/di_join_subjects.dart b/lib/ui/join_subjects/di/di_join_subjects.dart
@@ -0,0 +1,11 @@
+import 'package:aranduapp/ui/join_subjects/service/join_subjects_service.dart';
+import 'package:aranduapp/ui/join_subjects/viewmodel/join_subjects_viewmodel.dart';
+import 'package:get_it/get_it.dart';
+
+
+void setupJoinSubjectsDI() {
+
+  GetIt.instance.registerLazySingleton(() => JoinSubjectsService());
+  GetIt.instance.registerFactory(() => JoinSubjectsViewmodel());
+}
+
diff --git a/lib/ui/join_subjects/service/join_subjects_service.dart b/lib/ui/join_subjects/service/join_subjects_service.dart
@@ -0,0 +1,16 @@
+import 'package:aranduapp/core/network/auth_api.dart';
+import 'package:aranduapp/core/network/token_manager/repository/auth_repository.dart';
+import 'package:get_it/get_it.dart';
+
+class JoinSubjectsService {
+  Future<void> joinSubjects(String subjectId) async {
+
+    //TODO: isso está errado
+    String userId = (await GetIt.I<AuthRepository>().getUser()).id;
+
+    await AuthApi.getInstance(auth: true)
+        .post(path: '/users/$userId/subjects/subscribe/$subjectId');
+
+    return;
+  }
+}
diff --git a/lib/ui/join_subjects/view/join_subjects_view.dart b/lib/ui/join_subjects/view/join_subjects_view.dart
@@ -0,0 +1,140 @@
+import 'package:aranduapp/ui/join_subjects/viewmodel/join_subjects_viewmodel.dart';
+import 'package:aranduapp/ui/journey/view/journey_view.dart';
+import 'package:aranduapp/ui/shared/command_button.dart';
+import 'package:aranduapp/ui/subjects/model/subject_model.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:get_it/get_it.dart';
+
+class JoinSubjects extends StatelessWidget {
+  final SubjectModel subject;
+  const JoinSubjects({super.key, required this.subject});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider<JoinSubjectsViewmodel>.value(
+      value: GetIt.instance<JoinSubjectsViewmodel>(),
+      child: _JoinSubjectsScreen(subject: subject),
+    );
+  }
+}
+
+class _JoinSubjectsScreen extends StatelessWidget {
+  final SubjectModel subject;
+  const _JoinSubjectsScreen({required this.subject});
+
+  @override
+  Widget build(BuildContext context) {
+    final viewModel = Provider.of<JoinSubjectsViewmodel>(context);
+
+    return Scaffold(
+      appBar: _buildAppBar(context),
+      body: _buildJoinSubjects(context, viewModel, subject),
+    );
+  }
+
+  AppBar _buildAppBar(BuildContext context) {
+    return AppBar(
+      backgroundColor: Theme.of(context).colorScheme.surface,
+      elevation: 0,
+      title: Text(
+        subject.name,
+        style: TextStyle(
+          color: Theme.of(context).colorScheme.onSurface,
+          fontSize: 24,
+        ),
+      ),
+      leading: IconButton(
+        color: Theme.of(context).colorScheme.primary,
+        icon: const Icon(Icons.arrow_back),
+        onPressed: () {
+          Navigator.of(context).pop();
+        },
+      ),
+      centerTitle: true,
+      actions: [
+        Padding(
+          padding: const EdgeInsets.only(right: 16.0),
+          child: Center(
+            child: Icon(
+              Icons.notifications_none_outlined,
+              color: Theme.of(context).colorScheme.primary,
+              size: 32,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildJoinSubjects(BuildContext context,
+      JoinSubjectsViewmodel viewModel, SubjectModel subject) {
+    final screenWidth = MediaQuery.of(context).size.width;
+    final screenHeight = MediaQuery.of(context).size.height;
+
+    return Column(children: [
+      Expanded(
+        child: SingleChildScrollView(
+          child: Container(
+            padding: EdgeInsets.only(
+              left: screenWidth * 0.05,
+              right: screenWidth * 0.05,
+              top: screenHeight * 0.02,
+            ),
+            child: Column(
+              children: [
+                Row(children: [
+                  Icon(
+                    Icons.book,
+                    color: Theme.of(context).colorScheme.onSurface,
+                    size: 120,
+                  ),
+                  SizedBox(width: screenWidth * 0.03),
+                  Flexible(
+                      child: Text(
+                    subject.name,
+                    style: const TextStyle(
+                        fontSize: 20, fontWeight: FontWeight.w500),
+                    softWrap: true,
+                  )),
+                ]),
+                SizedBox(height: screenHeight * 0.06),
+                Text(
+                  subject.description,
+                  style: const TextStyle(fontSize: 13),
+                  textAlign: TextAlign.justify,
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+      Container(
+        padding: EdgeInsets.only(bottom: screenHeight * 0.05),
+        child: Center(
+          child: _joinButton(context, viewModel),
+        ),
+      ),
+    ]);
+  }
+
+  Widget _joinButton(BuildContext context, JoinSubjectsViewmodel viewModel) {
+    return CommandButton(
+      tap: () {
+        viewModel.joinsubjectsCommand.execute(subject.id);
+      },
+      command: viewModel.joinsubjectsCommand,
+      nameButton: "Ingressar",
+      onErrorCallback: (e) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Erro: $e')),
+        );
+      },
+      onSuccessCallback: () {
+        Navigator.of(context).push(
+          MaterialPageRoute(builder: (context) => Journey(subject: subject)),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/ui/join_subjects/viewmodel/join_subjects_viewmodel.dart b/lib/ui/join_subjects/viewmodel/join_subjects_viewmodel.dart
@@ -0,0 +1,18 @@
+import 'package:aranduapp/core/state/command.dart';
+import 'package:aranduapp/ui/join_subjects/service/join_subjects_service.dart';
+import 'package:async/async.dart';
+import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
+
+class JoinSubjectsViewmodel extends ChangeNotifier {
+  late Command1<void, String> joinsubjectsCommand;
+
+  JoinSubjectsViewmodel() {
+    joinsubjectsCommand = Command1(joinsubjects);
+  }
+
+  Future<Result<void>> joinsubjects(String subjectId) async {
+    await GetIt.instance<JoinSubjectsService>().joinSubjects(subjectId);
+    return Result.value(null);
+  }
+}
diff --git a/lib/ui/journey/model/journey_model.dart b/lib/ui/journey/model/journey_model.dart
@@ -3,7 +3,7 @@ import 'dart:convert';
 class JourneyModel {
   final String id;
   final String title;
-  final String description;
+  final String? description;
 
   JourneyModel({
     required this.id,
@@ -17,7 +17,7 @@ class JourneyModel {
     return JourneyModel(
       id: json['_id']! as String,
       title: json['title']! as String,
-      description: json['description']! as String,
+      description: json['description'] as String?,
     );
   }
 }
diff --git a/lib/ui/journey/service/journey_service.dart b/lib/ui/journey/service/journey_service.dart
@@ -19,7 +19,7 @@ class JourneyService {
       return JourneyModel(
           id: subjectMap['_id']! as String,
           title: subjectMap['title']! as String,
-          description: subjectMap['description']! as String);
+          description: subjectMap['description'] as String?);
     }).toList();
 
     return res;

diff --git a/lib/ui/journey/view/journey_view.dart b/lib/ui/journey/view/journey_view.dart
@@ -95,8 +95,8 @@ class _JourneyScreen extends StatelessWidget {
               color: Theme.of(context).colorScheme.primary,
               size: 32,
             ),
-            title: Text(journey.title),
-            subtitle: Text(journey.description),
+            title: Text(journey.title?? "NUll"),
+            subtitle: Text(journey.description?? "NULL"),
             trailing: Icon(
               Icons.chevron_right,
               color: Theme.of(context).colorScheme.primary,

diff --git a/lib/ui/subjects/service/subjects_service.dart b/lib/ui/subjects/service/subjects_service.dart
@@ -1,7 +1,10 @@
 import 'package:aranduapp/core/log/log.dart';
+import 'package:aranduapp/core/network/auth_api.dart';
 import 'package:aranduapp/core/network/studio_maker_api.dart';
+import 'package:aranduapp/core/network/token_manager/repository/auth_repository.dart';
 import 'package:aranduapp/ui/subjects/model/subject_model.dart';
 import 'package:dio/dio.dart';
+import 'package:get_it/get_it.dart';
 
 class SubjectService {
   Future<List<SubjectModel>> getSubjects() async {
@@ -16,10 +19,21 @@ class SubjectService {
       final Map<String, dynamic> subjectMap = e as Map<String, dynamic>;
 
       return SubjectModel(
-          id: subjectMap['_id']?? "Null",
+          id: subjectMap['_id'] ?? "Null",
           name: subjectMap['name'] ?? "Null",
-          shortName: subjectMap['shortName']?? "Null",
+          shortName: subjectMap['shortName'] ?? "Null",
           description: subjectMap['description'] ?? "Null");
     }).toList();
   }
+
+  Future<bool> isUsersubscribe(String subjectId) async {
+
+    //TODO: isso está errado
+    String userId = (await GetIt.I<AuthRepository>().getUser()).id;
+
+    Response response = await AuthApi.getInstance(auth: false)
+        .get(path: '/users/$userId/subscribedSubjects');
+
+    return response.toString().toLowerCase().contains(subjectId.toLowerCase());
+  }
 }