Skip to content

Commit

Permalink
fix: geocoding verification fix (#3832)
Browse files Browse the repository at this point in the history 
* fix: geocoding verification fix

* fix: e2e test fix
  • Loading branch information
@ludtkemorgan
ludtkemorgan authored Jan 26, 2024
1 parent 27c13b6 commit c3a6b9c
Show file tree
Hide file tree
Showing 3 changed files with 239 additions and 87 deletions.
212 changes: 170 additions & 42 deletions backend/core/src/applications/services/geocoding.service.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Listing } from "../../listings/entities/listing.entity"
import { InputType } from "../../shared/types/input-type"
import { MapLayer } from "../../map-layers/entities/map-layer.entity"
import { FeatureCollection } from "@turf/helpers"
import { ApplicationMultiselectQuestion } from "../entities/application-multiselect-question.entity"

describe("GeocodingService", () => {
let service: GeocodingService
Expand Down Expand Up @@ -175,7 +176,7 @@ describe("GeocodingService", () => {
multiselectQuestion: {
options: [
{
text: "Geocoding option by radius",
text: "Geocoding option by Radius",
collectAddress: true,
radiusSize: 5,
validationMethod: ValidationMethod.radius,
Expand All @@ -186,54 +187,46 @@ describe("GeocodingService", () => {
],
}
const preferenceAddress = { ...address, latitude: 38.89485, longitude: -77.04251 }
const application = {
id: "applicationId",
preferences: [
const preferences = [
{
key: "Geocoding preference",
options: [
{
key: "Geocoding option by Radius",
checked: true,
extraData: [
{
type: InputType.address,
value: preferenceAddress,
},
],
},
],
},
]
it("should save the validated value as extraData", () => {
const response = service.validateRadiusPreferences(
(preferences as unknown) as ApplicationMultiselectQuestion[],
listing as Listing
)
expect(response).toEqual([
{
key: "Geocoding preference",
options: [
{
key: "Geocoding option by radius",
key: "Geocoding option by Radius",
checked: true,
extraData: [
{
type: InputType.address,
value: preferenceAddress,
},
{ key: "geocodingVerified", type: InputType.text, value: "true" },
],
},
],
},
],
}
it("should save the validated value as extraData", async () => {
await service.validateRadiusPreferences(
(application as unknown) as Application,
listing as Listing
)
expect(applicationRepoUpdate).toBeCalledWith(
{ id: "applicationId" },
{
preferences: expect.arrayContaining([
expect.objectContaining({
key: "Geocoding preference",
options: [
{
checked: true,
extraData: [
{
type: "address",
value: preferenceAddress,
},
{ key: "geocodingVerified", type: "text", value: "true" },
],
key: "Geocoding option by radius",
},
],
}),
]),
}
)
])
})
})
describe("validateGeoLayerPreferences", () => {
Expand All @@ -255,9 +248,28 @@ describe("GeocodingService", () => {
],
}
const preferenceAddress = { ...address, latitude: 38.89485, longitude: -77.04251 }
const application = {
id: "applicationId",
preferences: [

const preference = {
key: "Geocoding preference",
options: [
{
key: "Geocoding option by map",
checked: true,
extraData: [
{
type: InputType.address,
value: preferenceAddress,
},
],
},
],
}
it("should save the validated value as extraData for map layer", async () => {
const response = await service.validateGeoLayerPreferences(
([preference] as unknown) as ApplicationMultiselectQuestion[],
listing as Listing
)
expect(response).toEqual([
{
key: "Geocoding preference",
options: [
Expand All @@ -269,23 +281,114 @@ describe("GeocodingService", () => {
type: InputType.address,
value: preferenceAddress,
},
{ key: "geocodingVerified", type: InputType.text, value: "true" },
],
},
],
},
])
})
})
describe("validateGeocodingPreferences", () => {
const listing = {
buildingAddress: address,
listingMultiselectQuestions: [
{
multiselectQuestion: {
options: [
{
text: "Geocoding option by radius",
collectAddress: true,
radiusSize: 5,
validationMethod: ValidationMethod.radius,
},
],
},
},
{
multiselectQuestion: {
options: [
{
text: "Geocoding option by map",
collectAddress: true,
mapLayerId: "mapLayerId",
validationMethod: ValidationMethod.map,
},
],
},
},
{
multiselectQuestion: {
options: [
{
text: "non-geocoding option",
},
],
},
},
],
}
it("should save the validated value as extraData for map layer", async () => {
await service.validateGeoLayerPreferences(

const preferenceAddress = { ...address, latitude: 38.89485, longitude: -77.04251 }
const preferences = [
{
key: "Geocoding preference by map",
options: [
{
key: "Geocoding option by map",
checked: true,
extraData: [
{
type: InputType.address,
value: preferenceAddress,
},
],
},
],
},
{
key: "Geocoding preference by radius",
options: [
{
key: "Geocoding option by radius",
checked: true,
extraData: [
{
type: InputType.address,
value: preferenceAddress,
},
],
},
],
},
{
key: "non-geocoding preference",
options: [
{
key: "non-geocoding option",
checked: true,
},
],
},
]

const application = {
id: "applicationId",
preferences: preferences,
}

it("should save all updated preferences", async () => {
await service.validateGeocodingPreferences(
(application as unknown) as Application,
listing as Listing
(listing as unknown) as Listing
)

expect(applicationRepoUpdate).toBeCalledWith(
{ id: "applicationId" },
{
preferences: expect.arrayContaining([
expect.objectContaining({
key: "Geocoding preference",
key: "Geocoding preference by map",
options: [
{
checked: true,
Expand All @@ -300,6 +403,31 @@ describe("GeocodingService", () => {
},
],
}),
expect.objectContaining({
key: "Geocoding preference by radius",
options: [
{
checked: true,
extraData: [
{
type: "address",
value: preferenceAddress,
},
{ key: "geocodingVerified", type: "text", value: "true" },
],
key: "Geocoding option by radius",
},
],
}),
expect.objectContaining({
key: "non-geocoding preference",
options: [
{
checked: true,
key: "non-geocoding option",
},
],
}),
]),
}
)
Expand Down
Loading

0 comments on commit c3a6b9c

Please sign in to comment.