House Price Finder

14 | 15 | 16 | 17 | 18 | 19 | 20 | -------------------------------------------------------------------------------- /src/client/pages/Details.fs: -------------------------------------------------------------------------------- 1 | module Pages.Details 2 | 3 | open Fable.Helpers.React 4 | open Fable.Helpers.React.Props 5 | open PropertyMapper.Contracts 6 | open Fable 7 | 8 | let private content txn = 9 | let field name value = 10 | value 11 | |> Option.map(fun v -> 12 | div [ ClassName "form-group row" ] [ 13 | label [ HtmlFor name; ClassName "col-sm-4 col-form-label" ] [ str name ] 14 | div [ ClassName "col-sm-8" ] [ input [ Type "text"; ClassName "form-control-plaintext"; Id name; Value v; ReadOnly true ] ] 15 | ]) 16 | |> Option.defaultValue (div [] []) 17 | 18 | div [ ClassName "modal-content" ] [ 19 | div [ ClassName "modal-header" ] [ 20 | h5 [ ClassName "modal-title"; Id "exampleModalLabel" ] [ str txn.Address.FirstLine ] 21 | button [ Type "button"; ClassName "close"; unbox ("data-dismiss", "modal"); unbox ("aria-label", "Close") ] [ 22 | span [ unbox ("aria-hidden", true) ] [ str "x" ] 23 | ] 24 | ] 25 | div [ ClassName "modal-body" ] [ 26 | field "Building / Street" (Some txn.Address.FirstLine) 27 | field "Town" (Some txn.Address.TownCity) 28 | field "District" (Some txn.Address.District) 29 | field "County" (Some txn.Address.County) 30 | field "Locality" txn.Address.Locality 31 | field "Post Code" txn.Address.PostCode 32 | field "Price" (Some(sprintf "£%s" (txn.Price |> commaSeparate))) 33 | field "Date of Transfer" (Some (txn.DateOfTransfer.ToShortDateString())) 34 | field "Property Type" (txn.BuildDetails.PropertyType |> Option.map(fun pt -> pt.Description)) 35 | field "Build Type" (Some (string txn.BuildDetails.Build.Description)) 36 | field "Contract" (Some (string txn.BuildDetails.Contract.Description)) 37 | ] 38 | div [ ClassName "modal-footer" ] [ 39 | button [ Type "button"; ClassName "btn btn-primary"; unbox ("data-dismiss", "modal") ] [ str "Close" ] 40 | ] 41 | ] 42 | 43 | let view txn = 44 | div [ ClassName "modal fade"; Id "exampleModal"; Role "dialog"; unbox ("aria-labelledby", "exampleModalLabel"); unbox ("aria-hidden", "true") ] [ 45 | div [ ClassName "modal-dialog"; Role "document" ] (match txn with Some txn -> [ content txn ] | None -> []) 46 | ] -------------------------------------------------------------------------------- /src/client/pages/Filter.fs: -------------------------------------------------------------------------------- 1 | module Pages.Filter 2 | 3 | open Fable.Helpers.React 4 | open Fable.Helpers.React.Props 5 | open PropertyMapper.Contracts 6 | 7 | let toFilterCard dispatch facet values = 8 | match values with 9 | | [] -> div [] [] 10 | | values -> 11 | div [ ClassName "card" ] [ 12 | div [ ClassName "card-header"; Role "tab"; Id (sprintf "heading-%s" facet) ] [ 13 | h5 [ ClassName "mb-0" ] [ 14 | a [ DataToggle "collapse"; Href (sprintf "#collapse-%s" facet); AriaExpanded true ] [ str facet ] 15 | ] 16 | ] 17 | div [ Id (sprintf "collapse-%s" facet); Role "tabpanel"; ClassName "collapse show" ] [ 18 | div [ ClassName "card-body" ] [ 19 | div [ ClassName "list-group" ] 20 | [ for value in values -> 21 | button [ 22 | ClassName ("list-group-item list-group-item-action") 23 | OnClick (fun _ -> dispatch (facet, value)) ] 24 | [ str value ] ] 25 | ] 26 | ] 27 | ] 28 | 29 | let createFilters dispatch facets = 30 | div [ ClassName "container" ] [ 31 | div [ ClassName "row" ] [ h4 [] [ str "Filters" ] ] 32 | div [ ClassName "row" ] [ 33 | div [ Id "accordion"; Role "tablist" ] [ 34 | toFilterCard dispatch "County" facets.Counties 35 | toFilterCard dispatch "District" facets.Districts 36 | toFilterCard dispatch "Town" facets.Towns 37 | toFilterCard dispatch "Locality" facets.Localities 38 | ] 39 | ] 40 | ] -------------------------------------------------------------------------------- /src/client/pages/Search.fs: -------------------------------------------------------------------------------- 1 | module Pages.Search 2 | 3 | open Elmish 4 | open Fable.Core.JsInterop 5 | open Fable.Helpers.React 6 | open Fable.Helpers.React.Props 7 | open Fable.PowerPack 8 | open PropertyMapper.Contracts 9 | open System 10 | open Client.Style 11 | open Fable.Import 12 | 13 | type SearchState = Searching | Displaying 14 | 15 | type SearchParameters = { Facet : (string * string) option; Page : int; Sort : (PropertyTableColumn * SortDirection) option } 16 | type SearchResults = { SearchTerm : SearchTerm; Response : SearchResponse } 17 | type Suggestions = { SuggestedTerms : string array; SelectedSuggestion : int option; Show : bool } 18 | type Model = 19 | { Term : SearchTerm 20 | DebouncedTerm : Debounce.Model 21 | Suggestions: Suggestions 22 | LastSearch : SearchTerm 23 | Status : SearchState 24 | Parameters : SearchParameters 25 | SearchResults : SearchResults option 26 | Selected : PropertyResult option } 27 | 28 | type Msg = 29 | | SetSearch of string 30 | | DoSearch of SearchTerm 31 | | SearchBoxEnter 32 | | SetFilter of string * string 33 | | SetSort of (PropertyTableColumn * SortDirection) option 34 | | ChangePage of int 35 | | SearchCompleted of SearchTerm * SearchResponse 36 | | SearchError of exn 37 | | SelectTransaction of PropertyResult 38 | | ShowSuggestions of bool 39 | | SelectSuggestionOffset of offset:int 40 | | SelectSuggestion of index:int 41 | | FetchSuggestions of SearchTerm 42 | | ReceiveSuggestions of string array 43 | | DebounceSearchTermMsg of Debounce.Msg 44 | 45 | let emptySuggestions = { SuggestedTerms = [| |]; SelectedSuggestion = None; Show = false } 46 | 47 | let init _ = 48 | { Term = SearchTerm.Empty 49 | DebouncedTerm = Debounce.init (TimeSpan.FromMilliseconds 300.) SearchTerm.Empty 50 | Suggestions = emptySuggestions 51 | LastSearch = SearchTerm.Empty 52 | Status = SearchState.Displaying 53 | Parameters = { Facet = None; Page = 0; Sort = None } 54 | SearchResults = None 55 | Selected = None } 56 | 57 | let viewResults searchResults currentSort dispatch = 58 | let toTh col = 59 | let currentSortDisplay, nextSortDir = 60 | match currentSort with 61 | | Some (sortCol, sortDirection) when sortCol = col -> 62 | match sortDirection with 63 | | Ascending -> " ▲", Some Descending 64 | | Descending -> " ▼", None 65 | | _ -> "", Some Ascending 66 | let nextSort = nextSortDir |> Option.map (fun sortDir -> col, sortDir) 67 | th [ Scope "col"; Style [ Cursor "pointer" ]; OnClick(fun _ -> dispatch (SetSort nextSort)) ] [ str (string col + currentSortDisplay) ] 68 | let toDetailsLink row c = 69 | td [ Scope "row" ] [ 70 | a [ Href "#" 71 | DataToggle "modal" 72 | unbox ("data-target", "#exampleModal") 73 | OnClick(fun _ -> dispatch (SelectTransaction row)) ] [ str c ] 74 | ] 75 | let toTd c = td [ Scope "row" ] [ str c ] 76 | div [ ClassName "border rounded m-3 p-3 bg-light" ] [ 77 | match searchResults with 78 | | None -> yield div [ ClassName "row" ] [ div [ ClassName "col" ] [ h3 [] [ str "Please perform a search!" ] ] ] 79 | | Some { Response = { Results = [||] } } -> yield div [ ClassName "row" ] [ div [ ClassName "col" ] [ h3 [] [ str "Your search yielded no results." ] ] ] 80 | | Some { SearchTerm = term; Response = response } -> 81 | let hits = response.TotalTransactions |> Option.map (commaSeparate >> sprintf " (%s hits)") |> Option.defaultValue "" 82 | let description = 83 | match term with 84 | | Term term -> sprintf "Search results for '%s'%s." term hits 85 | | PostcodeSearch postcode -> sprintf "Showing properties within a 1km radius of '%s'%s." postcode hits 86 | 87 | yield div [ ClassName "row" ] [ 88 | div [ ClassName "col-2" ] [ Filter.createFilters (SetFilter >> dispatch) response.Facets ] 89 | div [ ClassName "col-10" ] [ 90 | div [ ClassName "row" ] [ div [ ClassName "col" ] [ h4 [] [ str description ] ] ] 91 | table [ ClassName "table table-bordered table-hover" ] [ 92 | thead [] [ 93 | tr [] [ toTh Street 94 | toTh Town 95 | toTh Postcode 96 | toTh Date 97 | toTh Price ] 98 | ] 99 | tbody [] [ 100 | for row in response.Results -> 101 | let postcodeLink = 102 | a 103 | [ Href "#"; OnClick(fun _ -> row.Address.PostCode |> Option.iter(PostcodeSearch >> DoSearch >> dispatch)) ] 104 | [ row.Address.PostCode |> Option.defaultValue "" |> str ] 105 | tr [] [ toDetailsLink row row.Address.FirstLine 106 | toTd row.Address.TownCity 107 | td [ Scope "row" ] [ postcodeLink ] 108 | toTd (row.DateOfTransfer.ToShortDateString()) 109 | toTd (sprintf "£%s" (commaSeparate row.Price)) ] 110 | ] 111 | ] 112 | nav [] [ 113 | ul [ ClassName "pagination" ] [ 114 | let buildPager enabled content current page = 115 | li [ ClassName ("page-item" + (if enabled then "" else " disabled") + (if current then " active" else "")) ] [ 116 | button [ ClassName "page-link"; Style [ Cursor "pointer" ]; OnClick (fun _ -> dispatch (ChangePage page)) ] [ str content ] 117 | ] 118 | let currentPage = response.Page 119 | let totalPages = int ((response.TotalTransactions |> Option.defaultValue 0 |> float) / 20.) 120 | yield buildPager (currentPage > 0) "Previous" false (currentPage - 1) 121 | yield! 122 | [ for page in 0 .. totalPages -> 123 | buildPager true (string (page + 1)) (page = currentPage) page ] 124 | yield buildPager (currentPage < totalPages) "Next" false (currentPage + 1) 125 | ] 126 | ] 127 | ] 128 | ] 129 | ] 130 | 131 | let viewSuggestions dispatch suggestions = 132 | match suggestions.SuggestedTerms with 133 | | _ when not suggestions.Show -> [] 134 | | [| |] -> [] 135 | | _ -> 136 | let viewSuggestion i sug = 137 | let attributes = [ 138 | yield OnMouseDown (fun _ -> dispatch (SelectSuggestion i)) :> IHTMLProp 139 | if Some i = suggestions.SelectedSuggestion then yield ClassName "bg-primary" :> IHTMLProp ] 140 | div attributes [ str sug ] 141 | [ div 142 | [ Style [ Position "absolute"; ZIndex 10. ]; ClassName "border bg-light" ] 143 | [ yield! suggestions.SuggestedTerms |> Array.mapi viewSuggestion ] ] 144 | 145 | let searchValue = "searchValue" 146 | let setSearchValue text = Browser.document.getElementById(searchValue)?value <- text 147 | 148 | let view model dispatch = 149 | let progressBarVisibility = match model.Status with | Searching -> "visible" | Displaying -> "invisible" 150 | div [ ClassName "col" ] [ 151 | Details.view model.Selected 152 | div [ ClassName "border rounded m-3 p-3 bg-light" ] [ 153 | div [ ClassName "form-group" ] [ 154 | yield label [ HtmlFor searchValue ] [ str "Search for" ] 155 | yield input [ 156 | ClassName "form-control" 157 | Id searchValue 158 | Placeholder "Enter Search" 159 | OnChange (fun ev -> dispatch (SetSearch !!ev.target?value); dispatch (ShowSuggestions true)) 160 | OnFocus (fun _ -> dispatch (ShowSuggestions true)) 161 | OnBlur (fun _ -> Browser.window.setTimeout((fun _ -> dispatch (ShowSuggestions false)), 100) |> ignore) 162 | onKeyDown [ 163 | KeyCode.upArrow, fun _ -> dispatch (SelectSuggestionOffset -1) 164 | KeyCode.downArrow, fun _ -> dispatch (SelectSuggestionOffset 1) 165 | KeyCode.enter, fun _ -> dispatch SearchBoxEnter ] 166 | ] 167 | yield! viewSuggestions dispatch model.Suggestions 168 | ] 169 | div [ ClassName "form-group" ] [ 170 | div [ ClassName ("progress " + progressBarVisibility) ] [ 171 | div [ ClassName "progress-bar progress-bar-striped progress-bar-animated" 172 | Role "progressbar" 173 | Style [ Width "100%" ] ] 174 | [ str <| sprintf "Searching for '%s'..." model.LastSearch.Description ] 175 | ] 176 | ] 177 | button [ ClassName "btn btn-primary"; OnClick (fun _ -> dispatch (DoSearch model.Term)) ] [ str "Search!" ] ] 178 | viewResults model.SearchResults model.Parameters.Sort dispatch ] 179 | 180 | let queryString parameters = 181 | [ match parameters.Facet with Some f -> yield f | None -> () 182 | match parameters.Sort with 183 | | Some (col, dir) -> yield! [ ("SortColumn", (string col)); ("SortDirection", string dir) ] 184 | | None -> () ] 185 | |> List.map (fun (key:string, value) -> sprintf "%s=%s" key value) 186 | |> String.concat "&" 187 | |> function "" -> "" | s -> "?" + s 188 | 189 | let host = "http://localhost:5000" 190 | 191 | let findTransactions (text, parameters) = 192 | Fetch.fetchAs (sprintf "%s/property/find/%s/%d%s" host text parameters.Page (queryString parameters)) [] 193 | 194 | let findByPostcode (postCode, page, parameters) = 195 | Fetch.fetchAs (sprintf "%s/property/%s/1/%d%s" host postCode page (queryString parameters)) [] 196 | 197 | let fetchSuggestions text = 198 | match text with 199 | | Term text when not (String.IsNullOrWhiteSpace text) && text.Trim().Length >= 3 -> 200 | Fetch.fetchAs (sprintf "%s/property/find-suggestion/%s" host text) [] 201 | | Term _ | PostcodeSearch _ -> promise { return { Suggestions = [||] } } 202 | 203 | let updateSelectedSuggestion offset suggestions = 204 | let count = suggestions.SuggestedTerms.Length 205 | let newSelected = 206 | match suggestions.SelectedSuggestion with 207 | | Some current -> current 208 | | None when offset > 0 -> -1 209 | | None -> count 210 | |> fun initial -> (initial + offset + count) % count 211 | { suggestions with SelectedSuggestion = Some newSelected } 212 | 213 | let update msg model : Model * Cmd = 214 | let initiateSearch model term parameters = 215 | let cmd = 216 | match term with 217 | | Term text -> Cmd.ofPromise findTransactions (text, parameters) 218 | | PostcodeSearch postcode -> Cmd.ofPromise findByPostcode (postcode, parameters.Page, parameters) 219 | let cmd = cmd (fun response -> SearchCompleted(term, response)) SearchError 220 | { model with Status = Searching; LastSearch = term; Parameters = parameters; Suggestions = emptySuggestions }, cmd 221 | let setSearchToSuggestion model i = 222 | let suggestion = model.Suggestions.SuggestedTerms |> Array.tryItem i |> Option.defaultValue "" |> sprintf "\"%s\"" 223 | setSearchValue suggestion 224 | { model with Suggestions = emptySuggestions }, Cmd.ofMsg (SetSearch suggestion) 225 | match msg with 226 | | SetSearch text -> 227 | let term = Term text 228 | { model with Term = term }, Debounce.inputCmd term DebounceSearchTermMsg 229 | | DebounceSearchTermMsg msg -> 230 | Debounce.updateWithCmd 231 | msg 232 | DebounceSearchTermMsg 233 | model.DebouncedTerm 234 | (fun x -> { model with DebouncedTerm = x }) 235 | (FetchSuggestions >> Cmd.ofMsg) 236 | | DoSearch (Term text) when String.IsNullOrWhiteSpace text || text.Length <= 3 -> model, Cmd.none 237 | | DoSearch term -> initiateSearch model term { Facet = None; Page = 0; Sort = None } 238 | | SearchBoxEnter -> 239 | match model.Suggestions.SelectedSuggestion with 240 | | Some i -> setSearchToSuggestion model i 241 | | None -> model, Cmd.ofMsg (DoSearch model.Term) 242 | | SetFilter (facet, value) -> initiateSearch model model.LastSearch { model.Parameters with Facet = Some(facet, value) } 243 | | SetSort sort -> initiateSearch model model.LastSearch { model.Parameters with Sort = sort } 244 | | ChangePage page -> initiateSearch model model.LastSearch { model.Parameters with Page = page } 245 | | SearchCompleted (term, response) -> 246 | { model with 247 | Status = Displaying 248 | SearchResults = Some { SearchTerm = term; Response = response } 249 | Selected = None }, Cmd.none 250 | | SearchError _ -> model, Cmd.none 251 | | SelectTransaction transaction -> { model with Selected = Some transaction }, Cmd.none 252 | | ShowSuggestions b -> { model with Suggestions = { model.Suggestions with Show = b } }, Cmd.none 253 | | SelectSuggestionOffset offset -> { model with Suggestions = updateSelectedSuggestion offset model.Suggestions }, Cmd.none 254 | | SelectSuggestion i -> setSearchToSuggestion model i 255 | | FetchSuggestions text -> model, Cmd.ofPromise fetchSuggestions text (fun r -> ReceiveSuggestions r.Suggestions) (fun _ -> ReceiveSuggestions [||]) 256 | | ReceiveSuggestions sugs -> { model with Suggestions = { model.Suggestions with SuggestedTerms = sugs; SelectedSuggestion = None } }, Cmd.none 257 | -------------------------------------------------------------------------------- /src/client/pages/Shared.fs: -------------------------------------------------------------------------------- 1 | namespace Pages 2 | open PropertyMapper.Contracts 3 | 4 | type SearchTerm = 5 | | Term of string 6 | | PostcodeSearch of string 7 | static member Empty = Term "" 8 | member this.Description = match this with | Term x | PostcodeSearch x -> x 9 | 10 | [] 11 | module Helpers = 12 | let commaSeparate : int -> _ = string >> Seq.toArray >> Array.rev >> Array.chunkBySize 3 >> Array.map Array.rev >> Array.rev >> Array.map System.String >> String.concat "," 13 | -------------------------------------------------------------------------------- /src/client/paket.references: -------------------------------------------------------------------------------- 1 | dotnet-fable 2 | Fable.Elmish.Browser 3 | Fable.Elmish.Debugger 4 | Fable.Elmish.React 5 | Fable.Elmish.HMR -------------------------------------------------------------------------------- /src/client/public/fable.ico: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/SAFE-Stack/SAFE-Search/5c6b04188c5cd4cefdc2d855369be2c156e90a76/src/client/public/fable.ico -------------------------------------------------------------------------------- /src/client/webpack.config.js: -------------------------------------------------------------------------------- 1 | var path = require("path"); 2 | var webpack = require("webpack"); 3 | var fableUtils = require("fable-utils"); 4 | 5 | function resolve(filePath) { 6 | return path.join(__dirname, filePath) 7 | } 8 | 9 | var babelOptions = fableUtils.resolveBabelOptions({ 10 | presets: [ 11 | ["env", { 12 | "targets": { 13 | "browsers": ["last 2 versions"] 14 | }, 15 | "modules": false 16 | }] 17 | ], 18 | plugins: ["transform-runtime"] 19 | }); 20 | 21 | 22 | var isProduction = process.argv.indexOf("-p") >= 0; 23 | var port = process.env.SUAVE_FABLE_PORT || "8085"; 24 | console.log("Bundling for " + (isProduction ? "production" : "development") + "..."); 25 | 26 | module.exports = { 27 | devtool: "source-map", 28 | entry: resolve('client.fsproj'), 29 | output: { 30 | path: resolve('public'), 31 | publicPath: "public", 32 | filename: "bundle.js" 33 | }, 34 | resolve: { 35 | modules: [ resolve("../../node_modules/")] 36 | }, 37 | devServer: { 38 | proxy: { 39 | '/api/*': { 40 | target: 'http://localhost:' + port, 41 | changeOrigin: true 42 | } 43 | }, 44 | hot: true, 45 | inline: true 46 | }, 47 | module: { 48 | rules: [ 49 | { 50 | test: /\.fs(x|proj)?$/, 51 | use: { 52 | loader: "fable-loader", 53 | options: { 54 | babel: babelOptions, 55 | define: isProduction ? [] : ["DEBUG"] 56 | } 57 | } 58 | }, 59 | { 60 | test: /\.js$/, 61 | exclude: /node_modules/, 62 | use: { 63 | loader: 'babel-loader', 64 | options: babelOptions 65 | }, 66 | } 67 | ] 68 | }, 69 | plugins : isProduction ? [] : [ 70 | new webpack.HotModuleReplacementPlugin(), 71 | new webpack.NamedModulesPlugin() 72 | ] 73 | }; 74 | -------------------------------------------------------------------------------- /src/scripts/azure-schema.json: -------------------------------------------------------------------------------- 1 | { 2 | "postcodes": { 3 | "Postcode": { 4 | "Type": "String" 5 | }, 6 | "Longitude": { 7 | "Type": "double" 8 | }, 9 | "Latitude": { 10 | "Type": "double" 11 | } 12 | } 13 | } -------------------------------------------------------------------------------- /src/scripts/importdata.fsx: -------------------------------------------------------------------------------- 1 | /// This script creates a local dataset that can be used instead of Azure Search. 2 | 3 | #I @"..\.." 4 | #I @"..\..\.paket\load\" 5 | #load @"net461\Build\FSharp.Data.fsx" 6 | @"packages\build\FSharp.Azure.StorageTypeProvider\StorageTypeProvider.fsx" 7 | @"netstandard2.0\Fable.JsonConverter.fsx" 8 | @"src\server\Contracts.fs" 9 | @"netstandard2.0\Giraffe.fsx" 10 | @"netstandard2.0\Microsoft.Azure.Search.fsx" 11 | @"netstandard2.0\System.ComponentModel.Annotations.fsx" 12 | @"src\server\Configuration.fs" 13 | @"src\server\Search.fs" 14 | @"src\server\Search.Azure.fs" 15 | 16 | open FSharp.Data 17 | open Newtonsoft.Json 18 | open PropertyMapper.Contracts 19 | 20 | [] 21 | let PricePaidSchema = __SOURCE_DIRECTORY__ + @"\price-paid-schema.csv" 22 | type PricePaid = CsvProvider 23 | let fetchTransactions rows = 24 | let data = PricePaid.Load "http://prod.publicdata.landregistry.gov.uk.s3-website-eu-west-1.amazonaws.com/pp-monthly-update-new-version.csv" 25 | data.Rows 26 | |> Seq.take rows 27 | |> Seq.map(fun t -> 28 | { TransactionId = t.TransactionId 29 | Address = 30 | { Building = [ Some t.PAON; t.SAON ] |> List.choose id |> String.concat " " 31 | Street = t.Street 32 | Locality = t.Locality 33 | TownCity = t.``Town/City`` 34 | District = t.District 35 | County = t.County 36 | PostCode = t.Postcode } 37 | BuildDetails = 38 | { PropertyType = t.PropertyType |> Option.bind PropertyType.Parse 39 | Build = t.Duration |> BuildType.Parse 40 | Contract = t.``Old/New`` |> ContractType.Parse } 41 | Price = t.Price 42 | DateOfTransfer = t.Date }) 43 | |> Seq.toArray 44 | 45 | module FableJson = 46 | let private jsonConverter = Fable.JsonConverter() :> JsonConverter 47 | let toJson value = JsonConvert.SerializeObject(value, [|jsonConverter|]) 48 | let ofJson (json:string) = JsonConvert.DeserializeObject<'a>(json, [|jsonConverter|]) 49 | 50 | [] 51 | let PostCodesSchema = __SOURCE_DIRECTORY__ + @"\uk-postcodes-schema.csv" 52 | 53 | type Postcodes = CsvProvider 54 | 55 | type GeoPostcode = 56 | { PostCode : string * string 57 | Latitude : float 58 | Longitude : float } 59 | member this.PostCodeDescription = sprintf "%s %s" (fst this.PostCode) (snd this.PostCode) 60 | let fetchPostcodes (path:string) = 61 | let data = Postcodes.Load path 62 | data.Rows 63 | |> Seq.choose(fun r -> 64 | match r.Postcode.Split ' ', r.Latitude, r.Longitude with 65 | | [| partA; partB |], Some latitude, Some longitude -> 66 | Some 67 | { PostCode = (partA, partB) 68 | Latitude = float latitude 69 | Longitude = float longitude } 70 | | _ -> None) 71 | |> Seq.toArray 72 | 73 | open FSharp.Azure.StorageTypeProvider 74 | open FSharp.Azure.StorageTypeProvider.Table 75 | 76 | [] 77 | let AzureSchema = __SOURCE_DIRECTORY__ + @"\azure-schema.json" 78 | type Azure = AzureTypeProvider 79 | let table = Azure.Tables.postcodes 80 | let insertPostcodes connectionString postcodes = 81 | table.AsCloudTable().CreateIfNotExists() |> ignore 82 | let entities = 83 | postcodes 84 | |> Seq.map(fun p -> 85 | let partA, partB = p.PostCode 86 | Azure.Domain.postcodesEntity(Partition partA, Row partB, p.PostCodeDescription, p.Longitude, p.Latitude)) 87 | |> Seq.toArray 88 | table.Insert(entities, TableInsertMode.Upsert, connectionString) 89 | 90 | -------------------------------------------------------------------------------- /src/scripts/price-paid-schema.csv: -------------------------------------------------------------------------------- 1 | TransactionId,Price,Date,Postcode,PropertyType,Old/New,Duration,PAON,SAON,Street,Locality,Town/City,District,County,PpdCategoryType,RecordStatus 2 | {2AC10E4F-AE75-1AF6-E050-A8C063052BA1},159000,06/01/2016 00:00,,,N,F,KINGSMEAD,Test,,,LINCOLN,NORTH KESTEVEN,LINCOLNSHIRE,A,A 3 | {2AC10E4F-AE78-1AF6-E050-A8C063052BA1},125000,21/01/2016 00:00,LN7 6EH,D,N,F,KINGSMEAD,,MIDDLE STREET,NORTH KELSEY,MARKET RASEN,WEST LINDSEY,LINCOLNSHIRE,A,A 4 | -------------------------------------------------------------------------------- /src/scripts/uk-postcodes-schema.csv: -------------------------------------------------------------------------------- 1 | id,postcode,latitude,longitude 2 | 1,AB10 1XG,57.144165160000000,-2.114847768000000 3 | 2,AB10 6RN,57.137879760000000,-2.121486688000000 -------------------------------------------------------------------------------- /src/server/Configuration.fs: -------------------------------------------------------------------------------- 1 | namespace PropertyMapper 2 | 3 | type ConnectionString = ConnectionString of string 4 | type Configuration = 5 | { AzureStorage : ConnectionString 6 | AzureSearch : ConnectionString 7 | AzureSearchServiceName : string } 8 | 9 | -------------------------------------------------------------------------------- /src/server/Contracts.fs: -------------------------------------------------------------------------------- 1 | namespace PropertyMapper.Contracts 2 | 3 | open System 4 | 5 | type SortDirection = 6 | | Ascending | Descending 7 | static member TryParse str = 8 | if string Ascending = str then Some Ascending 9 | elif string Descending = str then Some Descending 10 | else None 11 | [] 12 | type Sort = { SortColumn : string option; SortDirection : SortDirection option } 13 | [] 14 | type PropertyFilter = 15 | { Town : string option 16 | Locality : string option 17 | District : string option 18 | County : string option 19 | MaxPrice : int option 20 | MinPrice : int option } 21 | type PropertyTableColumn = 22 | | Street | Town | Postcode | Date | Price 23 | static member TryParse s = 24 | if s = string Street then Some Street 25 | elif s = string Town then Some Town 26 | elif s = string Postcode then Some Postcode 27 | elif s = string Date then Some Date 28 | elif s = string Price then Some Price 29 | else None 30 | type PropertyType = 31 | | Detached | SemiDetached | Terraced | FlatsMaisonettes | Other 32 | member this.Description = 33 | match this with 34 | | PropertyType.SemiDetached -> "Semi Detatch" 35 | | PropertyType.FlatsMaisonettes -> "Flats / Maisonettes" 36 | | _ -> string this 37 | static member Parse = function "D" -> Some Detached | "S" -> Some SemiDetached | "T" -> Some Terraced | "F" -> Some FlatsMaisonettes | "O" -> Some Other | _ -> None 38 | type BuildType = 39 | | NewBuild | OldBuild 40 | member this.Description = 41 | match this with 42 | | BuildType.OldBuild -> "Old Build" 43 | | BuildType.NewBuild -> "New Build" 44 | static member Parse = function "Y" -> NewBuild | _ -> OldBuild 45 | 46 | type ContractType = 47 | | Freehold | Leasehold 48 | member this.Description = string this 49 | static member Parse = function "F" -> Freehold | _ -> Leasehold 50 | 51 | type Address = 52 | { Building : string 53 | Street : string option 54 | Locality : string option 55 | TownCity : string 56 | District : string 57 | County : string 58 | PostCode : string option } 59 | member address.FirstLine = 60 | [ Some address.Building; address.Street ] 61 | |> List.choose id 62 | |> String.concat " " 63 | type BuildDetails = 64 | { PropertyType : PropertyType option 65 | Build : BuildType 66 | Contract : ContractType } 67 | type PropertyResult = 68 | { TransactionId : Guid 69 | BuildDetails : BuildDetails 70 | Address : Address 71 | Price : int 72 | DateOfTransfer : DateTime } 73 | type Facets = 74 | { Towns : string list 75 | Localities : string list 76 | Districts : string list 77 | Counties : string list 78 | Prices : string list } 79 | type SearchResponse = 80 | { Results : PropertyResult array 81 | TotalTransactions : int option 82 | Page : int 83 | Facets : Facets } 84 | type SuggestResponse = 85 | { Suggestions : string array } 86 | -------------------------------------------------------------------------------- /src/server/FableJson.fs: -------------------------------------------------------------------------------- 1 | module FableJson 2 | 3 | open Newtonsoft.Json 4 | open Giraffe 5 | open Microsoft.AspNetCore.Http 6 | 7 | // The Fable.JsonConverter serializes F# types so they can be deserialized on the 8 | // client side by Fable into full type instances, see http://fable.io/blog/Introducing-0-7.html#JSON-Serialization 9 | // The converter includes a cache to improve serialization performance. Because of this, 10 | // it's better to keep a single instance during the server lifetime. 11 | let private jsonConverter = Fable.JsonConverter() :> JsonConverter 12 | 13 | let toJson value = 14 | JsonConvert.SerializeObject(value, [|jsonConverter|]) 15 | 16 | let ofJson<'a> (json:string) : 'a = 17 | JsonConvert.DeserializeObject<'a>(json, [|jsonConverter|]) 18 | 19 | let serialize x = 20 | setStatusCode 200 21 | >=> setHttpHeader "Content-Type" "application/json" 22 | >=> setBodyAsString (toJson x) 23 | 24 | 25 | let getJsonFromCtx<'a> (ctx:HttpContext) = task { 26 | let! t = ctx.ReadBodyFromRequestAsync() 27 | return ofJson<'a> t 28 | } -------------------------------------------------------------------------------- /src/server/Program.fs: -------------------------------------------------------------------------------- 1 | module PropertyMapper.App 2 | 3 | open System 4 | open System.IO 5 | open Microsoft.AspNetCore.Builder 6 | open Microsoft.AspNetCore.Cors.Infrastructure 7 | open Microsoft.AspNetCore.Hosting 8 | open Microsoft.Extensions.Logging 9 | open Microsoft.Extensions.Configuration 10 | open Microsoft.Extensions.DependencyInjection 11 | open Giraffe 12 | open Giraffe.Razor 13 | open PropertyMapper.Routing 14 | 15 | // --------------------------------- 16 | // Error handler 17 | // --------------------------------- 18 | 19 | let errorHandler (ex : Exception) (logger : ILogger) = 20 | logger.LogError(EventId(), ex, "An unhandled exception has occurred while executing the request.") 21 | clearResponse >=> setStatusCode 500 >=> text ex.Message 22 | 23 | // --------------------------------- 24 | // Config and Main 25 | // --------------------------------- 26 | 27 | let configureCors (builder : CorsPolicyBuilder) = 28 | builder.WithOrigins("http://localhost:8080").AllowAnyMethod().AllowAnyHeader() |> ignore 29 | 30 | let createSearch config = 31 | match config with 32 | | _ when String.IsNullOrWhiteSpace config.AzureSearchServiceName -> 33 | { new Search.ISearch with 34 | member __.GenericSearch request = Search.InMemory.findGeneric request 35 | member __.PostcodeSearch request = Search.InMemory.findByPostcode request 36 | member __.Suggest request = Search.InMemory.suggest request } 37 | | config -> 38 | { new Search.ISearch with 39 | member __.GenericSearch request = Search.Azure.findGeneric config request 40 | member __.PostcodeSearch request = Search.Azure.findByPostcode config AzureStorage.tryGetGeo request 41 | member __.Suggest request = Search.Azure.suggest config request } 42 | 43 | let configureApp searcher (app : IApplicationBuilder) = 44 | app.UseCors(configureCors) 45 | .UseGiraffeErrorHandler(errorHandler) 46 | .UseStaticFiles() 47 | .UseGiraffe(webApp searcher) 48 | 49 | let configureServices (services : IServiceCollection) = 50 | let sp = services.BuildServiceProvider() 51 | let env = sp.GetService() 52 | let viewsFolderPath = Path.Combine(env.ContentRootPath, "Views") 53 | services.AddRazorEngine viewsFolderPath |> ignore 54 | services.AddCors() |> ignore 55 | 56 | let configureLogging (builder : ILoggingBuilder) = 57 | let filter (l : LogLevel) = l.Equals LogLevel.Error 58 | builder.AddFilter(filter).AddConsole().AddDebug() |> ignore 59 | 60 | let appConfig = 61 | lazy 62 | let builder = 63 | ConfigurationBuilder() 64 | .SetBasePath(Directory.GetCurrentDirectory()) 65 | .AddJsonFile("appsettings.json", optional = true) 66 | .AddEnvironmentVariables() 67 | .Build() 68 | 69 | { AzureStorage = builder.GetConnectionString "AzureStorage" |> ConnectionString 70 | AzureSearch = builder.GetConnectionString "AzureSearch" |> ConnectionString 71 | AzureSearchServiceName = builder.["AzureSearchName"] } 72 | 73 | [] 74 | let main _ = 75 | let contentRoot = Directory.GetCurrentDirectory() 76 | let webRoot = Path.Combine(contentRoot, "WebRoot") 77 | let configureApp = appConfig.Value |> createSearch |> configureApp 78 | 79 | WebHostBuilder() 80 | .UseKestrel() 81 | .UseContentRoot(contentRoot) 82 | .UseIISIntegration() 83 | .UseWebRoot(webRoot) 84 | .Configure(Action configureApp) 85 | .ConfigureServices(configureServices) 86 | .ConfigureLogging(configureLogging) 87 | .Build() 88 | .Run() 89 | 0 -------------------------------------------------------------------------------- /src/server/Properties/launchSettings.json: -------------------------------------------------------------------------------- 1 | { 2 | "iisSettings": { 3 | "windowsAuthentication": false, 4 | "anonymousAuthentication": true, 5 | "iisExpress": { 6 | "applicationUrl": "http://localhost:5000/", 7 | "sslPort": 0 8 | } 9 | }, 10 | "profiles": { 11 | "IIS Express": { 12 | "commandName": "IISExpress", 13 | "launchBrowser": true, 14 | "environmentVariables": { 15 | "ASPNETCORE_ENVIRONMENT": "Development" 16 | } 17 | }, 18 | "server": { 19 | "commandName": "Project", 20 | "launchBrowser": true, 21 | "environmentVariables": { 22 | "ASPNETCORE_ENVIRONMENT": "Development" 23 | }, 24 | "applicationUrl": "http://localhost:5000/" 25 | } 26 | } 27 | } -------------------------------------------------------------------------------- /src/server/Routing.fs: -------------------------------------------------------------------------------- 1 | module PropertyMapper.Routing 2 | 3 | open PropertyMapper.Search 4 | open PropertyMapper.Contracts 5 | open Giraffe 6 | open Microsoft.AspNetCore.Http 7 | 8 | let searchProperties (searcher:Search.ISearch) (postCode:string, distance, page) next (ctx:HttpContext) = task { 9 | let! properties = 10 | searcher.PostcodeSearch 11 | { Filter = ctx.BindQueryString() 12 | Postcode = postCode.ToUpper() 13 | MaxDistance = distance 14 | Page = page } 15 | return! FableJson.serialize properties next ctx } 16 | 17 | let searchSuggest (searcher:Search.ISearch) text next (ctx:HttpContext) = 18 | task { 19 | let! properties = searcher.Suggest { Text = text } 20 | return! FableJson.serialize properties next ctx } 21 | 22 | let genericSearch (searcher:Search.ISearch) (text, page) next (ctx:HttpContext) = 23 | let request = 24 | { Page = page 25 | Text = if System.String.IsNullOrWhiteSpace text then None else Some text 26 | Filter = ctx.BindQueryString() 27 | Sort = 28 | { SortColumn = ctx.TryGetQueryStringValue "SortColumn" 29 | SortDirection = ctx.TryGetQueryStringValue "SortDirection" |> Option.bind SortDirection.TryParse } } 30 | task { 31 | let! properties = searcher.GenericSearch request 32 | return! FableJson.serialize properties next ctx } 33 | 34 | let webApp searcher : HttpHandler = 35 | choose [ 36 | GET >=> 37 | choose [ 38 | routef "/property/find/%s/%i" (genericSearch searcher) 39 | routef "/property/find-suggestion/%s" (searchSuggest searcher) 40 | routef "/property/%s/%i/%i" (searchProperties searcher) 41 | routef "/property/%s/%i" (fun (postcode, distance) -> searchProperties searcher (postcode, distance, 0)) 42 | ] 43 | setStatusCode 404 >=> text "Not Found" ] 44 | 45 | -------------------------------------------------------------------------------- /src/server/Search.Azure.fs: -------------------------------------------------------------------------------- 1 | module PropertyMapper.Search.Azure 2 | 3 | open Giraffe.Tasks 4 | open Microsoft.Azure.Search 5 | open Microsoft.Azure.Search.Models 6 | open Microsoft.Spatial 7 | open PropertyMapper 8 | open PropertyMapper.Contracts 9 | open System 10 | open System.ComponentModel.DataAnnotations 11 | open System.Threading.Tasks 12 | 13 | type SearchableProperty = 14 | { [] TransactionId : string 15 | [] Price : int 16 | [] DateOfTransfer : DateTime 17 | [] PostCode : string 18 | [] PropertyType : string 19 | [] Build : string 20 | [] Contract : string 21 | [] Building : string 22 | [] Street : string 23 | [] Locality : string 24 | [] Town : string 25 | [] District : string 26 | [] County : string 27 | [] Geo : GeographyPoint } 28 | 29 | let suggesterName = "suggester" 30 | 31 | [] 32 | module Management = 33 | open System.Collections.Generic 34 | let searchClient = 35 | let connections = Dictionary() 36 | fun config -> 37 | if not (connections.ContainsKey config) then 38 | let (ConnectionString c) = config.AzureSearch 39 | connections.[config] <- new SearchServiceClient(config.AzureSearchServiceName, SearchCredentials c) 40 | connections.[config] 41 | 42 | let propertiesIndex config = 43 | let client = searchClient config 44 | client.Indexes.GetClient "properties" 45 | 46 | let initialize config = 47 | let client = searchClient config 48 | if (client.Indexes.Exists "properties") then client.Indexes.Delete "properties" 49 | let suggester = Suggester(Name = suggesterName, SourceFields = [| "Street"; "Locality"; "Town"; "District"; "County" |]) 50 | Index(Name = "properties", Fields = FieldBuilder.BuildForType(), Suggesters = [| suggester |]) 51 | |> client.Indexes.Create 52 | 53 | [] 54 | module QueryBuilder = 55 | let findByDistance (geo:GeographyPoint) maxDistance = 56 | SearchParameters(Filter=sprintf "geo.distance(Geo, geography'POINT(%f %f)') le %d" geo.Longitude geo.Latitude maxDistance) 57 | let withFilter (parameters:SearchParameters) (field, value:string option) = 58 | parameters.Filter <- 59 | [ (match parameters.Filter with f when String.IsNullOrWhiteSpace f -> None | f -> Some f) 60 | (value |> Option.map(fun value -> sprintf "(%s eq '%s')" field (value.ToUpper()))) ] 61 | |> List.choose id 62 | |> String.concat " and " 63 | parameters 64 | 65 | let toSearchColumns col = 66 | match PropertyTableColumn.TryParse col with 67 | | Some Street -> [ "Building"; "Street" ] 68 | | Some Town -> [ "Town" ] 69 | | Some Postcode -> [ "PostCode" ] 70 | | Some Date -> [ "DateOfTransfer" ] 71 | | Some Price -> [ "Price" ] 72 | | None -> [] 73 | 74 | let orderBy sort (parameters:SearchParameters) = 75 | sort.SortColumn |> Option.iter (fun col -> 76 | let searchCols = toSearchColumns col 77 | let direction = match sort.SortDirection with Some Ascending | None -> "asc" | Some Descending -> "desc" 78 | parameters.OrderBy <- searchCols |> List.map (fun col -> sprintf "%s %s" col direction) |> ResizeArray) 79 | parameters 80 | 81 | let doSearch config page searchText (parameters:SearchParameters) = task { 82 | let searchText = searchText |> Option.map(fun searchText -> searchText + "*") |> Option.defaultValue "" 83 | parameters.Facets <- ResizeArray [ "Town"; "Locality"; "District"; "County"; "Price" ] 84 | parameters.Skip <- Nullable(page * 20) 85 | parameters.Top <- Nullable 20 86 | parameters.IncludeTotalResultCount <- true 87 | let! searchResult = (propertiesIndex config).Documents.SearchAsync(searchText, parameters) 88 | let facets = 89 | searchResult.Facets 90 | |> Seq.map(fun x -> x.Key, x.Value |> Seq.map(fun r -> r.Value |> string) |> Seq.toList) 91 | |> Map.ofSeq 92 | |> fun x -> x.TryFind >> Option.defaultValue [] 93 | return facets, searchResult.Results |> Seq.toArray |> Array.map(fun r -> r.Document), searchResult.Count |> Option.ofNullable |> Option.map int } 94 | 95 | let insertProperties config tryGetGeo (properties:PropertyResult seq) = 96 | let index = propertiesIndex config 97 | properties 98 | |> Seq.map(fun r -> 99 | { TransactionId = string r.TransactionId 100 | Price = r.Price 101 | DateOfTransfer = r.DateOfTransfer 102 | PostCode = r.Address.PostCode |> Option.toObj 103 | PropertyType = r.BuildDetails.PropertyType |> Option.map string |> Option.toObj 104 | Build = r.BuildDetails.Build.ToString() 105 | Contract = r.BuildDetails.Contract.ToString() 106 | Building = r.Address.Building 107 | Street = r.Address.Street |> Option.toObj 108 | Locality = r.Address.Locality |> Option.toObj 109 | Town = r.Address.TownCity 110 | District = r.Address.District 111 | County = r.Address.County 112 | Geo = r.Address.PostCode |> Option.bind tryGetGeo |> Option.map(fun (lat, long) -> GeographyPoint.Create(lat, long)) |> Option.toObj }) 113 | |> IndexBatch.Upload 114 | |> index.Documents.IndexAsync 115 | 116 | let private toFindPropertiesResponse findFacet count page results = 117 | { Results = 118 | results 119 | |> Array.map(fun result -> 120 | { TransactionId = Guid.Parse result.TransactionId 121 | BuildDetails = 122 | { PropertyType = result.PropertyType |> PropertyType.Parse 123 | Build = result.Build |> BuildType.Parse 124 | Contract = result.Contract |> ContractType.Parse } 125 | Address = 126 | { Building = result.Building 127 | Street = result.Street |> Option.ofObj 128 | Locality = result.Locality |> Option.ofObj 129 | TownCity = result.Town 130 | District = result.District 131 | County = result.County 132 | PostCode = result.PostCode |> Option.ofObj } 133 | Price = result.Price 134 | DateOfTransfer = result.DateOfTransfer }) 135 | TotalTransactions = count 136 | Facets = 137 | { Towns = findFacet "TownCity" 138 | Localities = findFacet "Locality" 139 | Districts = findFacet "District" 140 | Counties = findFacet "County" 141 | Prices = findFacet "Price" } 142 | Page = page } 143 | 144 | let applyFilters (filter:PropertyFilter) parameters = 145 | [ "TownCity", filter.Town 146 | "County", filter.County 147 | "Locality", filter.Locality 148 | "District", filter.District ] 149 | |> List.fold withFilter parameters 150 | 151 | let findGeneric config request = task { 152 | let! findFacet, searchResults, count = 153 | SearchParameters() 154 | |> applyFilters request.Filter 155 | |> orderBy request.Sort 156 | |> doSearch config request.Page request.Text 157 | return searchResults |> toFindPropertiesResponse findFacet count request.Page } 158 | 159 | let findByPostcode config tryGetGeo request = task { 160 | let! geo = 161 | match request.Postcode.Split ' ' with 162 | | [| partA; partB |] -> tryGetGeo config partA partB 163 | | _ -> Task.FromResult None 164 | let! findFacet, searchResults, count = 165 | match geo with 166 | | Some geo -> task { 167 | let geo = GeographyPoint.Create(geo.Lat, geo.Long) 168 | return! 169 | findByDistance geo request.MaxDistance 170 | |> applyFilters request.Filter 171 | |> doSearch config request.Page None } 172 | | None -> Task.FromResult ((fun _ -> []), [||], None) 173 | return searchResults |> toFindPropertiesResponse findFacet count request.Page } 174 | 175 | let suggest config request = task { 176 | let index = propertiesIndex config 177 | let! result = index.Documents.SuggestAsync(request.Text, suggesterName, SuggestParameters(Top = Nullable(10))) 178 | return { Suggestions = result.Results |> Seq.map (fun x -> x.Text) |> Seq.distinct |> Seq.toArray } } 179 | -------------------------------------------------------------------------------- /src/server/Search.InMemory.fs: -------------------------------------------------------------------------------- 1 | module PropertyMapper.Search.InMemory 2 | 3 | open PropertyMapper.Contracts 4 | open Giraffe.Tasks 5 | open System.Text.RegularExpressions 6 | 7 | let private data = lazy ("properties.json" |> System.IO.File.ReadAllText |> FableJson.ofJson) 8 | 9 | let findByPostcode (request:FindNearestRequest) = task { 10 | return 11 | { Results = [||] 12 | TotalTransactions = None 13 | Page = request.Page 14 | Facets = 15 | { Towns = [] 16 | Localities = [] 17 | Districts = [] 18 | Counties = [] 19 | Prices = [] } } } 20 | 21 | let sortResults sortParams results = 22 | match sortParams.SortColumn with 23 | | Some col -> 24 | let directedCompare a b = 25 | match PropertyTableColumn.TryParse col with 26 | | Some Street -> compare a.Address.FirstLine b.Address.FirstLine 27 | | Some Town -> compare a.Address.TownCity b.Address.TownCity 28 | | Some Postcode -> compare a.Address.PostCode b.Address.PostCode 29 | | Some Date -> compare a.DateOfTransfer b.DateOfTransfer 30 | | Some Price -> compare a.Price b.Price 31 | | None -> 0 32 | |> fun v -> 33 | match sortParams.SortDirection with 34 | | Some Ascending | None -> v 35 | | Some Descending -> -v 36 | results |> Array.sortWith directedCompare 37 | | None -> results 38 | 39 | let findGeneric (request:FindGenericRequest) = task { 40 | let genericFilter = 41 | match request.Text with 42 | | Some text -> 43 | let text = text.ToUpper() 44 | fun r -> 45 | r.Address.County.ToUpper().Contains text || 46 | r.Address.District.ToUpper().Contains text || 47 | r.Address.Locality |> Option.map(fun l -> l.ToUpper().Contains text) |> Option.defaultValue false || 48 | r.Address.TownCity.ToUpper().Contains text || 49 | r.Address.Street |> Option.map (fun s -> s.ToUpper().Contains text) |> Option.defaultValue false 50 | | None -> fun _ -> true 51 | let facetFilter filter mapper = 52 | match filter with 53 | | Some filter -> mapper >> fun (s:string) -> s.ToUpper() = filter 54 | | None -> fun _ -> true 55 | 56 | let matches = 57 | data.Value 58 | |> Array.filter genericFilter 59 | |> Array.filter (facetFilter request.Filter.County (fun r -> r.Address.County)) 60 | |> Array.filter (facetFilter request.Filter.District (fun r -> r.Address.District)) 61 | |> Array.filter (facetFilter request.Filter.Locality (fun r -> r.Address.Locality |> Option.defaultValue "")) 62 | |> Array.filter (facetFilter request.Filter.Town (fun r -> r.Address.TownCity)) 63 | |> sortResults request.Sort 64 | 65 | let getFacets mapper = Array.choose mapper >> Array.distinct >> Array.truncate 10 >> Array.toList 66 | return 67 | { Results = matches |> Array.skip (request.Page * 20) |> Array.truncate 20 68 | TotalTransactions = Some matches.Length 69 | Page = request.Page 70 | Facets = 71 | { Towns = matches |> getFacets (fun m -> Some m.Address.TownCity) 72 | Localities = matches |> getFacets (fun m -> m.Address.Locality) 73 | Districts = matches |> getFacets (fun m -> Some m.Address.District) 74 | Counties = matches |> getFacets (fun m -> Some m.Address.County) 75 | Prices = [] } } 76 | } 77 | 78 | let suggest request = task { 79 | let terms = Regex.Split(request.Text.ToLower(), "\s+") |> Array.filter ((<>) "") |> Array.distinct 80 | let termMatch (s:string) = terms |> Array.exists (fun t -> s.ToLower().Contains t) 81 | let suggestions = 82 | data.Value 83 | |> Seq.collect (fun x -> 84 | let add = x.Address 85 | [| add.FirstLine 86 | add.Locality |> Option.defaultValue "" 87 | add.TownCity 88 | add.District 89 | add.County 90 | add.PostCode |> Option.defaultValue "" |] 91 | |> Array.filter termMatch) 92 | |> Seq.truncate 20 93 | |> Seq.toArray 94 | return { Suggestions = suggestions } } -------------------------------------------------------------------------------- /src/server/Search.fs: -------------------------------------------------------------------------------- 1 | namespace PropertyMapper.Search 2 | 3 | open PropertyMapper.Contracts 4 | open System.Threading.Tasks 5 | 6 | type FindNearestRequest = { Postcode : string; MaxDistance : int; Page : int; Filter : PropertyFilter } 7 | type FindGenericRequest = { Text : string option; Page : int; Filter : PropertyFilter; Sort : Sort } 8 | type Geo = { Lat : float; Long : float } 9 | type SuggestRequest = { Text : string } 10 | 11 | type ISearch = 12 | abstract GenericSearch : FindGenericRequest -> SearchResponse Task 13 | abstract PostcodeSearch : FindNearestRequest -> SearchResponse Task 14 | abstract Suggest : SuggestRequest -> SuggestResponse Task -------------------------------------------------------------------------------- /src/server/Storage.fs: -------------------------------------------------------------------------------- 1 | module PropertyMapper.AzureStorage 2 | 3 | open Microsoft.WindowsAzure.Storage 4 | open Microsoft.WindowsAzure.Storage.Table 5 | open PropertyMapper 6 | open Giraffe.Tasks 7 | open PropertyMapper.Search 8 | 9 | let table (ConnectionString connection) = 10 | let tableClient = 11 | let connection = CloudStorageAccount.Parse connection 12 | connection.CreateCloudTableClient() 13 | tableClient.GetTableReference "postcodes" 14 | 15 | let tryGetGeo config postcodeA postcodeB = task { 16 | let! result = TableOperation.Retrieve(postcodeA, postcodeB) |> (table config.AzureStorage).ExecuteAsync 17 | let tryGetProp name (entity:DynamicTableEntity) = entity.Properties.[name].DoubleValue |> Option.ofNullable 18 | return 19 | result.Result 20 | |> Option.ofObj 21 | |> Option.bind(function 22 | | :? DynamicTableEntity as entity -> 23 | match entity |> tryGetProp "Lat", entity |> tryGetProp "Long" with 24 | | Some lat, Some long -> Some { Lat = lat; Long = long } 25 | | _ -> None 26 | | _ -> None) } 27 | -------------------------------------------------------------------------------- /src/server/paket.references: -------------------------------------------------------------------------------- 1 | Fable.JsonConverter 2 | Giraffe.Razor 3 | Microsoft.AspNetCore.Authentication.Cookies 4 | Microsoft.AspNetCore.Server.Kestrel 5 | Microsoft.AspNetCore.Server.IISIntegration 6 | Microsoft.AspNetCore.StaticFiles 7 | Microsoft.Azure.Search 8 | Microsoft.DotNet.Watcher.Tools 9 | Microsoft.Extensions.Configuration.Json 10 | Microsoft.Extensions.Logging.Console 11 | Microsoft.Extensions.Logging.Debug 12 | WindowsAzure.Storage -------------------------------------------------------------------------------- /src/server/server.fsproj: -------------------------------------------------------------------------------- 1 | 2 | 3 | Exe 4 | netcoreapp2.0 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | --------------------------------------------------------------------------------