fix failing tests

codekeyz · Oct 17, 2024 · 3cce451 · 3cce451
1 parent 2484ef2
commit 3cce451
Show file tree

Hide file tree

Showing 11 changed files with 183 additions and 182 deletions.
diff --git a/database/database.dart b/database/database.dart
diff --git a/database/migrations/2024_04_20_003612_create_users_table.dart b/database/migrations/2024_04_20_003612_create_users_table.dart
diff --git a/database/migrations/2024_04_20_003612_initial_setup.dart b/database/migrations/2024_04_20_003612_initial_setup.dart
@@ -0,0 +1,18 @@
+import 'package:backend/src/models/article/article.dart';
+import 'package:backend/src/models/user/user.dart';
+import 'package:yaroorm/yaroorm.dart';
+
+class InitialTableSetup extends Migration {
+  @override
+  void up(List<Schema> schemas) {
+    schemas.addAll([UserSchema, ArticleSchema]);
+  }
+
+  @override
+  void down(List<Schema> schemas) {
+    schemas.addAll([
+      Schema.dropIfExists(UserSchema),
+      Schema.dropIfExists(ArticleSchema),
+    ]);
+  }
+}
diff --git a/database/migrations/2024_04_20_003614_create_articles_table.dart b/database/migrations/2024_04_20_003614_create_articles_table.dart
diff --git a/lib/app/providers/provide_routes.dart b/lib/app/providers/provide_routes.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
-import 'package:backend/backend.dart';
 import 'package:pharaoh/pharaoh_next.dart';
 
 import '../routes/api.dart' as api;
+import '../routes/api.dart';
 import '../routes/web.dart' as web;
 
 class RouteServiceProvider extends ServiceProvider {
@@ -14,19 +14,11 @@ class RouteServiceProvider extends ServiceProvider {
         /*|--------------------------------------------------------------------------
           | API Routes
           |--------------------------------------------------------------------------*/
-        Route.group('api', [
-          Route.post('/auth/login', (AuthController, #login)),
-          Route.post('/auth/register', (AuthController, #register)),
 
-          Route.get('/users/<userId>', (UserController, #show)),
+        publicRoutes,
 
-          /// get articles and detail without auth
-          Route.group('articles', [
-            Route.get('/', (ArticleController, #index)),
-            Route.get('/<articleId>', (ArticleController, #show)),
-          ]),
-        ]),
-        Route.middleware('api:auth').group('api', api.routes),
+        //
+        Route.middleware('api:auth').group('api', api.authRoutes),
 
         /*|--------------------------------------------------------------------------
           | Web Routes

diff --git a/lib/app/routes/api.dart b/lib/app/routes/api.dart
@@ -1,7 +1,20 @@
 import 'package:backend/src/controllers/controllers.dart';
 import 'package:pharaoh/pharaoh_next.dart';
 
-List<RouteDefinition> routes = [
+final publicRoutes = Route.group('api', [
+  Route.post('/auth/login', (AuthController, #login)),
+  Route.post('/auth/register', (AuthController, #register)),
+
+  Route.get('/users/<userId>', (UserController, #show)),
+
+  /// get articles and detail without auth
+  Route.group('articles', [
+    Route.get('/', (ArticleController, #index)),
+    Route.get('/<articleId>', (ArticleController, #show)),
+  ]),
+]);
+
+List<RouteDefinition> authRoutes = [
   /// Users
   Route.group('users', [
     Route.get('/', (UserController, #index)),

diff --git a/lib/src/models/user/user.dart b/lib/src/models/user/user.dart
@@ -15,7 +15,7 @@ class User extends Entity<User> {
 
   final String email;
 
-  @JsonKey(includeToJson: false)
+  @JsonKey(defaultValue: '', includeToJson: false)
   final String password;
 
   @createdAtCol

diff --git a/lib/src/services/article_service.dart b/lib/src/services/article_service.dart
@@ -36,9 +36,9 @@ class ArticleService {
 
     return await ArticleQuery.insert(NewArticle(
       title: data.title,
-      description: data.description,
-      imageUrl: imageUrl,
       ownerId: user.id,
+      description: data.description,
+      imageUrl: Value.absentIfNull(imageUrl),
     ));
   }
 
@@ -51,9 +51,9 @@ class ArticleService {
     if (!(await query.exists())) return null;
 
     await query.update(UpdateArticle(
-      title: value(dto.title),
-      description: value(dto.description),
-      imageUrl: value(dto.imageUrl),
+      title: Value.absentIfNull(dto.title),
+      description: Value.absentIfNull(dto.description),
+      imageUrl: Value.absentIfNull(dto.imageUrl),
     ));
 
     return query.findOne();