chore: merge pr #90

Version 1

Author: eduardoteles17

.gitignore

@@ -17,7 +17,14 @@
 # Package managers
 node_modules
 *.iml
+
+# Flutter/Dart/Pub related
 pubspec.lock
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+build/
 
 # Dev
 .env

.vscode/settings.json

@@ -1,5 +1,9 @@
 {
+  "cSpell.words": ["asuka", "itourism", "starbase"],
   "dart.runPubGetOnPubspecChanges": false,
+  "files.exclude": {
+    "**/*.g.dart": true
+  },
   "material-icon-theme.activeIconPack": "nest",
   "material-icon-theme.files.associations": {
     "justfile": "makefile",
@@ -10,8 +14,9 @@
     "tsconfig/next.json": "tsconfig"
   },
   "material-icon-theme.folders.associations": {
-    "tsconfig": "typescript",
+    "attractions": "cart",
+    "cities": "home",
     "nestjs": "api",
-    "attractions": "cart"
+    "tsconfig": "typescript"
   }
 }

apps/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itourism/api",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
     "bootstrap": "just bootstrap",

apps/api/src/models/cities.model.ts

@@ -0,0 +1,16 @@
+/* eslint-disable no-use-before-define */
+import { BaseModel } from '@itourism/nestjs';
+
+export class CitiesModel extends BaseModel<CitiesModel> {
+  id: string;
+
+  name: string;
+
+  latitude: number;
+
+  longitude: number;
+
+  createdAt: Date;
+
+  updatedAt: Date;
+}

apps/api/src/modules/app/app.interceptors.ts

@@ -1,3 +1,4 @@
+import { ErrorsInterceptor } from '@itourism/nestjs';
 import { ClassSerializerInterceptor } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { NestExpressApplication } from '@nestjs/platform-express';
@@ -6,4 +7,6 @@ export function applyGlobalInterceptors(app: NestExpressApplication) {
   const appReflector = app.get<Reflector>(Reflector);
 
   app.useGlobalInterceptors(new ClassSerializerInterceptor(appReflector));
+
+  app.useGlobalInterceptors(new ErrorsInterceptor());
 }

apps/api/src/modules/app/app.module.ts

@@ -5,6 +5,7 @@ import { AppCacheModule } from 'infra/cache/cache.module';
 import { AppConfigModule } from 'infra/config/config.module';
 import { AppThrottlerModule } from 'infra/throttler/throttler.module';
 import { AttractionsModule } from 'modules/attractions/attractions.module';
+import { CitiesModule } from 'modules/cities/cities.module';
 import { EventsModule } from 'modules/events/events.module';
 
 @Module({
@@ -14,6 +15,7 @@ import { EventsModule } from 'modules/events/events.module';
     AppThrottlerModule,
     EventsModule,
     AttractionsModule,
+    CitiesModule,
   ],
   providers: [
     {

apps/api/src/modules/attractions/attractions.controller.ts

@@ -38,8 +38,8 @@ export class AttractionsController {
     );
   }
 
-  @Get()
+  @Get(':id')
   async findById(@Param(':id') id: string): Promise<AttractionModel> {
-    return this.attractionsService.findOneById(id);
+    return this.attractionsService.findById(id);
   }
 }

apps/api/src/modules/attractions/attractions.service.ts

@@ -1,8 +1,12 @@
-import { PrismaPaginator, serializeCollection } from '@itourism/nestjs';
+import {
+  NotFoundError,
+  PrismaPaginator,
+  serializeCollection,
+} from '@itourism/nestjs';
 import { Injectable } from '@nestjs/common';
-import { NotFoundError } from 'errors/not-found.error';
 import { PrismaService } from 'infra/prisma/prisma.service';
-import { AttractionModel, AttractionType } from 'models/attraction.model';
+import { AttractionModel } from 'models/attraction.model';
+import type { AttractionType } from 'models/attraction.model';
 
 @Injectable()
 export class AttractionsService {
@@ -32,7 +36,7 @@ export class AttractionsService {
     return serializeCollection(attractions, AttractionModel);
   }
 
-  async findOneById(id: string): Promise<AttractionModel> {
+  async findById(id: string): Promise<AttractionModel> {
     const attraction = await this.prismaService.attraction.findUnique({
       where: { id },
       select: {

apps/api/src/modules/cities/cities.controller.ts

@@ -0,0 +1,21 @@
+import { Paginator, UsePaginator } from '@itourism/nestjs';
+import {
+  CacheInterceptor,
+  Controller,
+  Get,
+  UseInterceptors,
+} from '@nestjs/common';
+import { CitiesModel } from 'models/cities.model';
+
+import { CitiesService } from './cities.service';
+
+@Controller('cities')
+@UseInterceptors(CacheInterceptor)
+export class CitiesController {
+  constructor(private readonly citiesService: CitiesService) {}
+
+  @Get()
+  async findAll(@UsePaginator() paginator?: Paginator): Promise<CitiesModel[]> {
+    return this.citiesService.findAll(paginator?.prisma);
+  }
+}

apps/api/src/modules/cities/cities.module.ts

@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+import { PrismaModule } from 'infra/prisma/prisma.module';
+
+import { CitiesController } from './cities.controller';
+import { CitiesService } from './cities.service';
+
+@Module({
+  imports: [PrismaModule],
+  providers: [CitiesService],
+  controllers: [CitiesController],
+})
+export class CitiesModule {}

apps/api/src/modules/cities/cities.service.ts

@@ -0,0 +1,18 @@
+import { PrismaPaginator, serializeCollection } from '@itourism/nestjs';
+import { Injectable } from '@nestjs/common';
+import { PrismaService } from 'infra/prisma/prisma.service';
+import { CitiesModel } from 'models/cities.model';
+
+@Injectable()
+export class CitiesService {
+  constructor(private readonly prismaService: PrismaService) {}
+
+  async findAll(paginator?: PrismaPaginator): Promise<CitiesModel[]> {
+    const cities = await this.prismaService.city.findMany({
+      skip: paginator?.skip,
+      take: paginator?.take,
+    });
+
+    return serializeCollection(cities, CitiesModel);
+  }
+}

apps/mobile/android/app/build.gradle

@@ -22,11 +22,14 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
+// START: FlutterFire Configuration
+apply plugin: 'com.google.gms.google-services'
+// END: FlutterFire Configuration
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 33
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -47,7 +50,7 @@ android {
         applicationId "app.itourism.itourism_mobile"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 20
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

apps/mobile/android/app/google-services.json

@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "788455666315",
+    "project_id": "cod3rocket-itourism",
+    "storage_bucket": "cod3rocket-itourism.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:788455666315:android:0b84bb8af2bf87664cda8e",
+        "android_client_info": {
+          "package_name": "app.itourism.itourism_mobile"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "788455666315-nblo98bf6pn27dfa7pi6g4hk65vrl0pn.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAXLNSDmHFslmviz6Jqmg2ofLL27NO9WsM"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "788455666315-nblo98bf6pn27dfa7pi6g4hk65vrl0pn.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

apps/mobile/android/app/src/main/1024.png

@@ -1,9 +1,28 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="app.itourism.itourism_mobile">
+   <queries>
+      <intent>
+        <action android:name="android.intent.action.VIEW" />
+        <data android:scheme="tel" />
+      </intent>
+      <intent>
+        <action android:name="android.intent.action.VIEW" />
+        <data android:scheme="https" />
+      </intent>
+      <intent>
+        <action android:name="android.intent.action.view" />
+        <data android:scheme="comgooglemaps" />
+      </intent>
+   </queries>
    <application
-        android:label="itourism_mobile"
+        android:label="iTourism"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+          android:name="com.google.android.geo.API_KEY"
+          android:value="AIzaSyBEFMk4H0rNXx0AlX7mqNkyBxpO0Zi_D8k" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"

apps/mobile/android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
+  <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
+</adaptive-icon>

apps/mobile/android/app/src/main/play_store_512.png

@@ -7,6 +7,9 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:7.1.2'
+        // START: FlutterFire Configuration
+        classpath 'com.google.gms:google-services:4.3.10'
+        // END: FlutterFire Configuration
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }