Fix dart analysis issues

codekeyz · Oct 17, 2024 · 28d086c · 28d086c
1 parent 29060c4
commit 28d086c
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 37 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,23 +1,9 @@
-# This file configures the static analysis results for your project (errors,
-# warnings, and lints).
-#
-# This enables the 'recommended' set of lints from `package:lints`.
-# This set helps identify many issues that may lead to problems when running
-# or consuming Dart code, and enforces writing Dart using a single, idiomatic
-# style and format.
-#
-# If you want a smaller set of lints you can change this to specify
-# 'package:lints/core.yaml'. These are just the most critical lints
-# (the recommended set includes the core lints).
-# The core lints are also what is used by pub.dev for scoring packages.
-
 include: package:lints/recommended.yaml
 
-# Uncomment the following section to specify additional rules.
 
-# linter:
-#   rules:
-#     - camel_case_types
+linter: 
+  rules:
+    file_names: false
 
 analyzer:
   exclude:

diff --git a/database/config.dart b/database/config.dart
@@ -1,6 +1,22 @@
 import 'package:path/path.dart' as path;
 import 'package:yaroorm/yaroorm.dart';
 
+// Database password: dYEQHjitxY53TMyH
+// Database username: postgres.srzosrzaqllpicsemkup
+// Database host: aws-0-us-east-1.pooler.supabase.com
+// Database name: postgres
+
+// DatabaseConnection(
+//       'pg',
+//       DatabaseDriverType.pgsql,
+//       port: env<int>('DB_PORT', 6543),
+//       host: env<String>('DB_HOST', ''),
+//       username: env<String>('DB_USERNAME', ''),
+//       password: env<String>('DB_PASSWORD', ''),
+//       database: env<String>('DB_DATABASE', ''),
+//       secure: true,
+//     ),
+
 @DB.useConfig
 final config = YaroormConfig(
   'test_db',

diff --git a/database/database.dart b/database/database.dart
diff --git a/database/migrations/2024_04_20_003612_initial_setup.dart b/database/migrations/2024_04_20_003612_initial_setup.dart
@@ -1,5 +1,5 @@
-import 'package:backend/src/models/article/article.dart';
-import 'package:backend/src/models/user/user.dart';
+import 'package:backend/src/models/article.dart';
+import 'package:backend/src/models/user.dart';
 import 'package:yaroorm/yaroorm.dart';
 
 class InitialTableSetup extends Migration {

diff --git a/lib/app/middlewares/api_auth_middleware.dart b/lib/app/middlewares/api_auth_middleware.dart
@@ -1,6 +1,6 @@
 import 'package:pharaoh/pharaoh_next.dart';
 
-import '../../src/models/user/user.dart';
+import '../../src/models/user.dart';
 import '../../src/services/auth_service.dart';
 
 class ApiAuthMiddleware extends ClassMiddleware {

diff --git a/lib/app/providers/providers.dart b/lib/app/providers/providers.dart
@@ -1,5 +1,3 @@
-library providers;
-
 export 'provide_blog_services.dart';
 export 'provide_core.dart';
 export 'provide_database.dart';

diff --git a/lib/src/controllers/article_controller.dart b/lib/src/controllers/article_controller.dart
@@ -2,8 +2,8 @@ import 'package:backend/src/dto/article_dto.dart';
 import 'package:backend/src/services/services.dart';
 import 'package:pharaoh/pharaoh_next.dart';
 
-import '../models/article/article.dart';
-import '../models/user/user.dart';
+import '../models/article.dart';
+import '../models/user.dart';
 
 class ArticleController extends HTTPController {
   final ArticleService _articleService;

diff --git a/lib/src/controllers/auth_controller.dart b/lib/src/controllers/auth_controller.dart
@@ -5,7 +5,7 @@ import 'package:pharaoh/pharaoh.dart';
 import 'package:pharaoh/pharaoh_next.dart';
 
 import '../dto/dto.dart';
-import '../models/user/user.dart';
+import '../models/user.dart';
 import '../services/services.dart';
 
 class AuthController extends HTTPController {

diff --git a/lib/src/controllers/user_controller.dart b/lib/src/controllers/user_controller.dart
@@ -1,6 +1,6 @@
 import 'package:pharaoh/pharaoh_next.dart';
 
-import '../models/user/user.dart';
+import '../models/user.dart';
 
 class UserController extends HTTPController {
   UserController();

diff --git a/lib/src/models/article/article.dart → lib/src/models/article.dart b/lib/src/models/article/article.dart → lib/src/models/article.dart
@@ -1,7 +1,7 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:yaroorm/yaroorm.dart';
 
-import '../user/user.dart';
+import 'user.dart';
 
 part 'article.g.dart';
 

diff --git a/lib/src/models/user/user.dart → lib/src/models/user.dart b/lib/src/models/user/user.dart → lib/src/models/user.dart
@@ -1,7 +1,7 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:yaroorm/yaroorm.dart';
 
-import '../article/article.dart';
+import 'article.dart';
 
 part 'user.g.dart';
 

diff --git a/lib/src/services/article_service.dart b/lib/src/services/article_service.dart
@@ -7,9 +7,9 @@ import 'package:yaroorm/yaroorm.dart';
 import 'package:http/http.dart' as http;
 
 import 'package:backend/src/dto/article_dto.dart';
-import 'package:backend/src/models/article/article.dart';
+import 'package:backend/src/models/article.dart';
 
-import '../models/user/user.dart';
+import '../models/user.dart';
 
 class ArticleService {
   Future<List<Article>> getArticles({int? ownerId}) async {

diff --git a/lib/src/services/auth_service.dart b/lib/src/services/auth_service.dart
@@ -4,7 +4,7 @@ import 'package:dart_jsonwebtoken/dart_jsonwebtoken.dart';
 import 'package:collection/collection.dart';
 import 'package:pharaoh/pharaoh.dart';
 
-import '../models/user/user.dart';
+import '../models/user.dart';
 
 class AuthService {
   final String jwtKey;

diff --git a/lib/src/services/services.dart b/lib/src/services/services.dart
@@ -1,4 +1,2 @@
-library services;
-
 export 'auth_service.dart';
 export 'article_service.dart';
diff --git a/test/backend_test.dart b/test/backend_test.dart
@@ -2,8 +2,8 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:backend/backend.dart';
-import 'package:backend/src/models/article/article.dart';
-import 'package:backend/src/models/user/user.dart';
+import 'package:backend/src/models/article.dart';
+import 'package:backend/src/models/user.dart';
 import 'package:spookie/spookie.dart';
 import '../database/database.dart' as database;