update firebase

This commit is contained in:
2021-05-21 11:28:56 +02:00
parent 7bf2a06b16
commit 80260df71f
7 changed files with 256 additions and 274 deletions

View File

@@ -1,7 +1,6 @@
import {Injectable} from '@angular/core';
import {AngularFirestore, AngularFirestoreCollection, AngularFirestoreDocument} from '@angular/fire/firestore';
import {Observable} from 'rxjs';
import {map} from 'rxjs/operators';
type CollectionPredicate<T> = string | AngularFirestoreCollection<T>;
type DocumentPredicate<T> = string | AngularFirestoreDocument<T>;
@@ -23,22 +22,11 @@ export class DbService {
}
public doc$<T>(ref: DocumentPredicate<T>): Observable<T> {
return this.doc(ref).snapshotChanges().pipe(
map(doc => {
const data = doc.payload.data();
const id = doc.payload.id;
return {...data, id} as T;
})
);
return this.doc(ref).valueChanges({idField: 'id'});
}
public col$<T>(ref: CollectionPredicate<T>, queryFn?): Observable<T[]> {
return this.col(ref, queryFn).snapshotChanges().pipe(
map(doc => doc.map(_ => {
const data = _.payload.doc.data();
const id = _.payload.doc.id;
return {...data, id} as T;
}))
);
return this.col(ref, queryFn).valueChanges({idField: 'id'});
}
}