6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit cc009062
Changed files
comwell_key_app/lib/database/daos/upsales_dao.dart | 44 +------------------ .../lib/database/mappers/upsale_mapper.dart | 34 --------------- comwell_key_app/lib/database/models/upsale_db.dart | 49 ---------------------- 3 files changed, 2 insertions(+), 125 deletions(-)
Diff
diff --git a/comwell_key_app/lib/database/daos/upsales_dao.dart b/comwell_key_app/lib/database/daos/upsales_dao.dart
index 8b268728..c1da9389 100644
--- a/comwell_key_app/lib/database/daos/upsales_dao.dart
+++ b/comwell_key_app/lib/database/daos/upsales_dao.dart
@@ -1,7 +1,6 @@
import 'dart:convert';
import 'package:comwell_key_app/database/comwell_db.dart';
-import 'package:comwell_key_app/database/models/upsale_db.dart';
import 'package:comwell_key_app/database/tables/upsale_table.dart';
import 'package:comwell_key_app/up_sales/mappers/up_sales_mapper.dart';
import 'package:comwell_key_app/up_sales/models/dto/up_sales_dto.dart';
@@ -16,12 +15,6 @@ class UpsalesDAO extends DatabaseAccessor<ComwellDatabase>
with _$UpsalesDAOMixin {
UpsalesDAO(super.attachedDatabase);
- /// Get all upsales from the database
- Future<List<UpsaleModel>> getAllUpsales() async {
- final results = await select(upsaleEntity).get();
- return results.map((row) => UpsaleModel.fromJson(row.toJson())).toList();
- }
-
/// Get upsales by confirmation number
Future<UpSales> getUpsaleByConfirmationNumber(
String confirmationNumber) async {
@@ -35,45 +28,12 @@ class UpsalesDAO extends DatabaseAccessor<ComwellDatabase>
return UpSalesDTO.fromJson(json).toUpSales();
}
- /// Insert a single upsale
Future<void> insertUpsale(UpSalesDTO upsale) async {
- final upsaleModel = UpsaleModel.fromUpSalesDTO(upsale);
final entity = UpsaleEntityCompanion.insert(
- id: upsaleModel.id,
- json: upsaleModel.json,
+ id: upsale.confirmationNumber,
+ json: jsonEncode(upsale),
);
await batch((batch) =>
batch.insert(upsaleEntity, entity, mode: InsertMode.insertOrReplace));
}
-
- /// Update an existing upsale
- Future<void> updateUpsale(UpSalesDTO upsale) async {
- final upsaleModel = UpsaleModel.fromUpSalesDTO(upsale);
- final entity = UpsaleEntityCompanion(
- id: Value(upsaleModel.id),
- json: Value(upsaleModel.json),
- );
- await update(upsaleEntity).replace(entity);
- }
-
- /// Delete upsale by confirmation number
- Future<void> deleteUpsaleByConfirmationNumber(
- String confirmationNumber) async {
- await (delete(upsaleEntity)
- ..where((tbl) => tbl.id.equals(confirmationNumber)))
- .go();
- }
-
- /// Delete all upsales
- Future<void> deleteAllUpsales() async {
- await delete(upsaleEntity).go();
- }
-
- /// Check if upsale exists by confirmation number
- Future<bool> upsaleExists(String confirmationNumber) async {
- final query = select(upsaleEntity)
- ..where((tbl) => tbl.id.equals(confirmationNumber));
- final result = await query.getSingleOrNull();
- return result != null;
- }
}
diff --git a/comwell_key_app/lib/database/mappers/upsale_mapper.dart b/comwell_key_app/lib/database/mappers/upsale_mapper.dart
deleted file mode 100644
index df7db81e..00000000
--- a/comwell_key_app/lib/database/mappers/upsale_mapper.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-import 'package:comwell_key_app/database/models/upsale_db.dart';
-import 'package:comwell_key_app/up_sales/models/dto/up_sales_dto.dart';
-
-/// Extension to provide mapping functionality between UpsaleModel and UpSalesDTO
-extension UpsaleModelMapper on UpsaleModel {
- /// Converts UpsaleModel to UpSalesDTO
- UpSalesDTO toUpSalesDTO() {
- return toUpSalesDTO();
- }
-}
-
-/// Extension to provide mapping functionality for lists of UpsaleModel
-extension ListUpsaleModelMapper on List<UpsaleModel> {
- /// Converts list of UpsaleModel to list of UpSalesDTO
- List<UpSalesDTO> toUpSalesDTOs() {
- return map((upsaleModel) => upsaleModel.toUpSalesDTO()).toList();
- }
-}
-
-/// Extension to provide mapping functionality between UpSalesDTO and UpsaleModel
-extension UpSalesDTOMapper on UpSalesDTO {
- /// Converts UpSalesDTO to UpsaleModel
- UpsaleModel toUpsaleModel() {
- return UpsaleModel.fromUpSalesDTO(this);
- }
-}
-
-/// Extension to provide mapping functionality for lists of UpSalesDTO
-extension ListUpSalesDTOMapper on List<UpSalesDTO> {
- /// Converts list of UpSalesDTO to list of UpsaleModel
- List<UpsaleModel> toUpsaleModels() {
- return map((upSalesDTO) => upSalesDTO.toUpsaleModel()).toList();
- }
-}
diff --git a/comwell_key_app/lib/database/models/upsale_db.dart b/comwell_key_app/lib/database/models/upsale_db.dart
deleted file mode 100644
index 9fabbc32..00000000
--- a/comwell_key_app/lib/database/models/upsale_db.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-import 'dart:convert';
-import 'package:comwell_key_app/up_sales/models/dto/up_sales_dto.dart';
-import 'package:equatable/equatable.dart';
-
-class UpsaleModel extends Equatable {
- final String id;
- final String json;
-
- const UpsaleModel({
- required this.id,
- required this.json,
- });
-
- factory UpsaleModel.fromJson(Map<String, dynamic> json) {
- return UpsaleModel(
- id: json['id'] as String,
- json: json['json'] as String,
- );
- }
-
- Map<String, dynamic> toJson() {
- return {
- 'id': id,
- 'json': json,
- };
- }
-
- /// Converts the stored JSON string back to UpSalesDTO
- UpSalesDTO toUpSalesDTO() {
- final Map<String, dynamic> jsonMap = jsonDecode(json) as Map<String, dynamic>;
- return UpSalesDTO.fromJson(jsonMap);
- }
-
- /// Creates UpsaleModel from UpSalesDTO
- factory UpsaleModel.fromUpSalesDTO(UpSalesDTO upSalesDTO) {
- return UpsaleModel(
- id: upSalesDTO.confirmationNumber,
- json: jsonEncode(upSalesDTO.toJson()),
- );
- }
-
- @override
- List<Object?> get props => [id, json];
-
- @override
- String toString() {
- return 'UpsaleModel(id: $id, json: $json)';
- }
-}