Merge branch 'GeoJSON2' into 'Development'

GeoJSON data to database

See merge request !6

src/mapmarkers/mapmarker.dto.ts

-import { IsString, IsDateString } from 'class-validator';
-import { Timestamp } from 'typeorm';
+import { IsString, IsJSON } from 'class-validator';
+/*
+DTO: MapMarker
+- represents servers data handling.
+*/
+
 
 export class MapMarkerDTO {
     @IsString()
@@ -10,4 +14,6 @@ export class MapMarkerDTO {
     longitude: string;
     @IsString()
     timestamp: string;    
+    @IsJSON()
+    features: JSON;
 }
\ No newline at end of file

src/mapmarkers/mapmarker.entity.ts

@@ -2,12 +2,18 @@ import { Entity, Column, PrimaryGeneratedColumn, Timestamp, ManyToOne } from 'ty
 
 import { PersonEntity } from 'src/user/user.entity'
 
+/*
+Entity: MapMarker 
+- represents data that database contains on mapmarker
+*/
+
 @Entity('MapMarker')
 export class MapMarkerEntity {
     @PrimaryGeneratedColumn('uuid') id: string;
     @Column({type: 'text'}) latitude: string;
     @Column({type: 'text'}) longitude: string;
     @Column({type: 'timestamp'}) timestamp: Timestamp;
+    @Column({type: 'json', nullable: true}) features: JSON;
     @ManyToOne(type => PersonEntity, player => player.markers)
     player: PersonEntity;
 }
\ No newline at end of file

src/mapmarkers/mapmarker.service.ts

@@ -10,6 +10,7 @@ import { userInfo } from 'os';
 @Injectable()
 export class MapMarkerService {
     constructor(
+        //create references to tables as repositories
         @InjectRepository(MapMarkerEntity) private mapmarkerRepository: Repository<MapMarkerEntity>,
         @InjectRepository(PersonEntity) private personRepository: Repository<PersonEntity>
     ) { }
@@ -17,10 +18,15 @@ export class MapMarkerService {
     // insert markers
     async insertLocation(personId: string, data: MapMarkerDTO) {
         try {
-            data.timestamp = new Date(Date.now()).toLocaleString(); //get functions runtime as timestamp
+            //get functions runtime as timestamp
+            data.timestamp = new Date(Date.now()).toLocaleString(); 
+            //check from database for the user who uploads the data
             const user = await this.personRepository.findOne({ where: { id: personId } })
+            //create&copy entity properties
             const location = await this.mapmarkerRepository.create({ ...data, player: user });
+            // insert created entity NOTE: insert method doesn't check for duplicates.
             await this.mapmarkerRepository.insert(location);
+            // return data and player id&name
             return { ...data, player: location.player.nameObject() };
         } catch (error) {
             return error;
@@ -30,7 +36,9 @@ export class MapMarkerService {
     // get all markers
     async getAllMarkers() {
         try {
+            // find all markers with specified player
             const markers = await this.mapmarkerRepository.find({ relations: ['player'] });
+            // return markers from database with said playerdata
             return markers.map(marker => { return { ...marker, player: marker.player.nameObject() } });
         } catch (error) {
             return error.message;

src/mapmarkers/mapmarkers.controller.ts

@@ -20,7 +20,7 @@ export class MapMarkersController {
         }
     }
 
-    // return all markers
+    // return all markers through service
     @Get('getall')
     async getAll(){
         return this.mapmarkerservice.getAllMarkers();