Skip to content

Commit 190fbbf

Browse files
authored
feat: Rework code structure (#19)
* some refactoring * setup example swagger documentation route * simplify swagger sample * rework code * fix failing tests
1 parent 8a26967 commit 190fbbf

File tree

18 files changed

+248
-274
lines changed

18 files changed

+248
-274
lines changed

bin/backend.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
import 'package:yaroorm/yaroorm.dart';
2-
import 'package:backend/app/app.dart';
2+
import 'package:backend/backend.dart';
33

4-
import '../config/app.dart' as app;
5-
import '../config/database.dart' as db;
4+
import '../database/config.dart' as orm;
65
import 'backend.reflectable.dart';
76

8-
final blogApp = App(app.config);
9-
107
void main(List<String> arguments) async {
118
initializeReflectable();
129

13-
DB.init(db.config);
10+
DB.init(orm.config);
1411

1512
await blogApp.bootstrap();
1613
}

bin/tools/migrator.dart

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
import 'package:yaroorm/migration/cli.dart';
2-
import 'package:yaroorm/yaroorm.dart';
3-
4-
import '../../config/database.dart' as db;
1+
// ignore: depend_on_referenced_packages
2+
import 'package:yaroo_cli/orm/runner.dart';
53

4+
import '../../database/config.dart' as orm;
65
import 'migrator.reflectable.dart';
76

87
export 'package:backend/src/models/models.dart';
98

109
void main(List<String> args) async {
11-
if (args.isEmpty) return print('Nothing to do here');
12-
1310
initializeReflectable();
14-
15-
DB.init(db.config);
16-
17-
await MigratorCLI.processCmd(args[0], cmdArguments: args.sublist(1));
11+
await OrmCLIRunner.start(args, orm.config);
1812
}

config/app.dart

Lines changed: 0 additions & 107 deletions
This file was deleted.

config/database.dart

Lines changed: 0 additions & 32 deletions
This file was deleted.

database/config.dart

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import 'package:path/path.dart' as path;
2+
import 'package:yaroo/yaroo.dart';
3+
import 'package:yaroorm/yaroorm.dart';
4+
5+
import './migrations/create_articles_table.dart';
6+
import './migrations/create_users_table.dart';
7+
8+
final config = YaroormConfig(
9+
env<String>('DB_CONNECTION', 'test_db'),
10+
connections: [
11+
DatabaseConnection(
12+
'test_db',
13+
DatabaseDriverType.sqlite,
14+
database: env('DB_DATABASE', path.absolute('database', 'db.sqlite')),
15+
),
16+
DatabaseConnection(
17+
'mysql',
18+
DatabaseDriverType.mysql,
19+
port: env<int>('DB_PORT', 0),
20+
host: env<String>('DB_HOST', ''),
21+
username: env<String>('DB_USERNAME', ''),
22+
password: env<String>('DB_PASSWORD', ''),
23+
database: env<String>('DB_DATABASE', ''),
24+
secure: true,
25+
),
26+
],
27+
migrations: [CreateUsersTable(), CreateArticlesTable()],
28+
);

lib/app/app.dart

Lines changed: 0 additions & 12 deletions
This file was deleted.

lib/app/http/kernel.dart

Lines changed: 0 additions & 29 deletions
This file was deleted.

lib/app/http/middlewares/core_middleware.dart renamed to lib/app/middlewares/core_middleware.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ class CoreMiddleware extends Middleware {
1616
next();
1717
}
1818

19-
_webMdw = loggerMdw.chain(cookieParserMdw);
19+
if (app.config.environment == 'development') {
20+
_webMdw = loggerMdw.chain(cookieParserMdw);
21+
} else {
22+
_webMdw = cookieParserMdw;
23+
}
2024
}
2125

2226
@override

lib/app/middlewares/middlewares.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export 'api_auth_middleware.dart';
2+
export 'core_middleware.dart';

0 commit comments

Comments
 (0)