Merge pull request #51 from sharedstreets/project-points

new point queries

Author: russbiggs

lib/database/survey_point_dao.dart

@@ -3,7 +3,7 @@ import 'package:moor_flutter/moor_flutter.dart';
 
 part 'survey_point_dao.g.dart';
 
-@UseDao(tables: [SurveyPoints])
+@UseDao(tables: [SurveyPoints, SurveyItems, Surveys])
 class SurveyPointDao extends DatabaseAccessor<CurbWheelDatabase>
     with _$SurveyPointDaoMixin {
   SurveyPointDao(CurbWheelDatabase db) : super(db);
@@ -12,9 +12,6 @@ class SurveyPointDao extends DatabaseAccessor<CurbWheelDatabase>
 
   Stream<List<SurveyPoint>> watchAllPoints() => select(surveyPoints).watch();
 
-  Future<List<SurveyPoint>> getPointsBySurveyItemId(String surveyItemId) =>
-      select(surveyPoints).get();
-
   Future insertPoint(SurveyPointsCompanion surveyPoint) =>
       into(surveyPoints).insert(surveyPoint);
 
@@ -23,4 +20,27 @@ class SurveyPointDao extends DatabaseAccessor<CurbWheelDatabase>
 
   Future deletePoint(SurveyPoint surveyPoint) =>
       delete(surveyPoints).delete(surveyPoint);
+  
+  Future<List<SurveyPoint>> getPointsBySurveyItemId(String surveyItemId) =>
+      (select(surveyPoints)..where((sp) => sp.surveyItemId.equals(surveyItemId))).get();
+
+  Future<List<SurveyPoint>> getPointsBySurveyId(String surveyId) =>
+    (select(surveyPoints)
+          ..where((t) => surveys.id.equals(surveyId))
+          ..join([
+            innerJoin(surveyItems,
+                surveyItems.id.equalsExp(surveyPoints.surveyItemId)),
+            innerJoin(surveys,
+                surveys.id.equalsExp(surveyItems.surveyId))
+          ])).get();
+  
+  Future<List<SurveyPoint>> getPointsByProjectId(String projectId) =>
+    (select(surveyPoints)
+          ..where((t) => surveys.projectId.equals(projectId))
+          ..join([
+            innerJoin(surveyItems,
+                surveyItems.id.equalsExp(surveyPoints.surveyItemId)),
+            innerJoin(surveys,
+                surveys.id.equalsExp(surveyItems.surveyId))
+          ])).get();
 }

lib/database/survey_point_dao.g.dart

@@ -786,7 +786,7 @@ packages:
       name: sqflite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.2+3"
+    version: "1.3.1+2"
   sqflite_common:
     dependency: transitive
     description:
@@ -984,5 +984,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.10.2 <2.11.0"
-  flutter: ">=1.22.2 <2.0.0"
+  dart: ">=2.10.0 <2.11.0"
+  flutter: ">=1.22.0 <2.0.0"