Skip to content

Commit

Permalink
Removed single data checks, added more logs
Browse files Browse the repository at this point in the history
dmbaranov committed Mar 10, 2024
1 parent 8b02dcd commit ac69c40
Showing 5 changed files with 19 additions and 23 deletions.
9 changes: 6 additions & 3 deletions lib/src/core/conversator.dart
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@ import 'dart:convert';
import 'package:cron/cron.dart';
import 'package:http/http.dart' as http;
import 'package:weather/src/globals/module_exception.dart';
import 'package:weather/src/injector/injection.dart';
import 'package:weather/src/utils/logger.dart';
import 'database.dart';

const String _converstorApiURL = 'https://api.openai.com/v1/chat/completions';
@@ -39,11 +41,12 @@ class ConversatorUser {

class Conversator {
final Database db;
final Logger _logger;
final String conversatorApiKey;
final String adminId;
final String _apiBaseUrl = _converstorApiURL;

Conversator({required this.db, required this.conversatorApiKey, required this.adminId});
Conversator({required this.db, required this.conversatorApiKey, required this.adminId}) : _logger = getIt<Logger>();

void initialize() {
_startResetDailyInvocationsUsageJob();
@@ -130,9 +133,9 @@ class Conversator {
var result = await db.conversatorUser.resetDailyInvocations();

if (result == 0) {
print('Something went wrong with resetting conversator daily invocations usage');
_logger.w('Something went wrong with resetting conversator daily invocations usage');
} else {
print('Reset conversator daily invocation usage for $result rows');
_logger.i('Reset conversator daily invocation usage for $result rows');
}
});
}
12 changes: 7 additions & 5 deletions lib/src/core/repositories/repository.dart
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
import 'dart:io';
import 'package:meta/meta.dart';
import 'package:postgres/postgres.dart';
import 'package:weather/src/injector/injection.dart';
import 'package:weather/src/utils/logger.dart';

const String _pathToQueries = 'assets/db/queries';

class Repository {
final String repositoryName;
final Pool dbConnection;
final Logger _logger;
final String _queriesDirectory = _pathToQueries;

@protected
final Map<String, String> queriesMap = {};

Repository({required this.repositoryName, required this.dbConnection});
Repository({required this.repositoryName, required this.dbConnection}) : _logger = getIt<Logger>();

initRepository() async {
var queriesLocation = Directory('$_queriesDirectory/$repositoryName');
@@ -30,7 +33,7 @@ class Repository {
@protected
Future<Result?> executeQuery(String? query, [Map<String, dynamic>? parameters]) async {
if (query == null) {
print('Wrong query $query');
_logger.e('Wrong query: $query');

return null;
}
@@ -41,7 +44,7 @@ class Repository {
@protected
Future<int> executeTransaction(String? query, [Map<String, dynamic>? parameters]) async {
if (query == null) {
print('Wrong query $query');
_logger.e('Wrong query: $query');

return 0;
}
@@ -51,8 +54,7 @@ class Repository {

return queryResult.affectedRows;
}).catchError((error) {
print('DB transaction error');
print(error);
_logger.e('DB transaction error: $error');

return 0;
});
6 changes: 0 additions & 6 deletions lib/src/core/repositories/reputation_repository.dart
Original file line number Diff line number Diff line change
@@ -24,12 +24,6 @@ class ReputationRepository extends Repository {
return null;
}

if (data.length != 1) {
print('One piece of reputation data data was expected, got ${data.length} instead');

return null;
}

var reputationData = data[0].toColumnMap();

return SingleReputationData(
6 changes: 0 additions & 6 deletions lib/src/core/repositories/weather_repository.dart
Original file line number Diff line number Diff line change
@@ -38,12 +38,6 @@ class WeatherRepository extends Repository {
return [];
}

if (data.length != 1) {
print('One piece of cities data was expected, got ${data.length} instead');

return null;
}

var citiesData = data[0].toColumnMap();

return citiesData['cities']?.split(',');
9 changes: 6 additions & 3 deletions lib/src/core/reputation.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'dart:async';
import 'package:cron/cron.dart';
import 'package:weather/src/globals/module_exception.dart';
import 'package:weather/src/injector/injection.dart';
import 'package:weather/src/utils/logger.dart';
import 'events/accordion_poll_events.dart';
import 'database.dart';
import 'event_bus.dart';
@@ -32,8 +34,9 @@ class ChatReputationData {
class Reputation {
final Database db;
final EventBus eventBus;
final Logger _logger;

Reputation({required this.db, required this.eventBus});
Reputation({required this.db, required this.eventBus}) : _logger = getIt<Logger>();

void initialize() {
_startResetVotesJob();
@@ -137,9 +140,9 @@ class Reputation {
var result = await db.reputation.resetChangeOptions(numberOfVoteOptions);

if (result == 0) {
print('Something went wrong with resetting reputation change options');
_logger.w('Something went wrong with resetting reputation change options');
} else {
print('Reset reputation change options for $result rows');
_logger.i('Reset reputation change options for $result rows');
}
});
}

0 comments on commit ac69c40

Please sign in to comment.