diff --git a/assets/templates/partials/census/variables-table.tmpl b/assets/templates/partials/census/variables-table.tmpl index 802c035..cb7ebd1 100644 --- a/assets/templates/partials/census/variables-table.tmpl +++ b/assets/templates/partials/census/variables-table.tmpl @@ -40,9 +40,6 @@ {{- localise "AreaTypeDefaultCoverage" $language 1 -}} {{ else }} {{- $dim.Title -}} - {{ if gt $dim.TotalItems 0 }} - ({{- thousandsSeparator $dim.TotalItems -}}) - {{ end }} {{ end }} {{else}} diff --git a/go.mod b/go.mod index ebad242..d04385f 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/ONSdigital/dp-healthcheck v1.5.0 github.com/ONSdigital/dp-net v1.5.0 github.com/ONSdigital/dp-net/v2 v2.8.1 - github.com/ONSdigital/dp-renderer v1.58.2 + github.com/ONSdigital/dp-renderer v1.62.0 github.com/ONSdigital/log.go/v2 v2.3.0 github.com/PuerkitoBio/goquery v1.8.0 github.com/golang/mock v1.6.0 diff --git a/go.sum b/go.sum index 1ddeea4..1432bfe 100644 --- a/go.sum +++ b/go.sum @@ -7,18 +7,6 @@ github.com/ONSdigital/dp-api-clients-go v1.34.3/go.mod h1:kX+YKuoLYLfkeLHMvQKRRy github.com/ONSdigital/dp-api-clients-go v1.41.1/go.mod h1:Ga1+ANjviu21NFJI9wp5NctJIdB4TJLDGbpQFl2V8Wc= github.com/ONSdigital/dp-api-clients-go v1.43.0 h1:0982P/YxnYXvba1RhEcFmwF3xywC4eXokWQ8YH3Mm24= github.com/ONSdigital/dp-api-clients-go v1.43.0/go.mod h1:V5MfINik+o3OAF985UXUoMjXIfrZe3JKYa5AhZn5jts= -github.com/ONSdigital/dp-api-clients-go/v2 v2.234.0 h1:wCNIuZ+4QyKtSS3IG7NtOKIsXVe9BUtm90BpjE1Pdd4= -github.com/ONSdigital/dp-api-clients-go/v2 v2.234.0/go.mod h1:PFfLdey8l0/ufzF6/x2mn+OL+9M5/xlg4JOQpFHmCbk= -github.com/ONSdigital/dp-api-clients-go/v2 v2.236.0 h1:8HjVZJiv8va3fH3KKGZg1oBjGeLAndlkajxPr6EERg8= -github.com/ONSdigital/dp-api-clients-go/v2 v2.236.0/go.mod h1:PFfLdey8l0/ufzF6/x2mn+OL+9M5/xlg4JOQpFHmCbk= -github.com/ONSdigital/dp-api-clients-go/v2 v2.236.1-0.20230303135103-21d92e1301c7 h1:A1cw5FcMr/UJqGxFaVGpabSX+mfXKcg88a4F5aiLfIo= -github.com/ONSdigital/dp-api-clients-go/v2 v2.236.1-0.20230303135103-21d92e1301c7/go.mod h1:PFfLdey8l0/ufzF6/x2mn+OL+9M5/xlg4JOQpFHmCbk= -github.com/ONSdigital/dp-api-clients-go/v2 v2.237.0 h1:rQ9oeftFOScLDeb6oTcqWw9Ln1OQtFtBwYfYzuNYuCg= -github.com/ONSdigital/dp-api-clients-go/v2 v2.237.0/go.mod h1:PFfLdey8l0/ufzF6/x2mn+OL+9M5/xlg4JOQpFHmCbk= -github.com/ONSdigital/dp-api-clients-go/v2 v2.249.1-0.20230330122847-ea03933aee24 h1:J8uBRAFinvGD1ilijz7Um1SIRabF+nayFmejDJPeUg8= -github.com/ONSdigital/dp-api-clients-go/v2 v2.249.1-0.20230330122847-ea03933aee24/go.mod h1:PFfLdey8l0/ufzF6/x2mn+OL+9M5/xlg4JOQpFHmCbk= -github.com/ONSdigital/dp-api-clients-go/v2 v2.250.0 h1:xvZ6RNYFvAj5aiOzg/QCXZRCKU7qBj73iYSx+Eo0RoI= -github.com/ONSdigital/dp-api-clients-go/v2 v2.250.0/go.mod h1:PFfLdey8l0/ufzF6/x2mn+OL+9M5/xlg4JOQpFHmCbk= github.com/ONSdigital/dp-api-clients-go/v2 v2.251.0 h1:bTghPHxyRwYJGrlJ/88/2gtIPU8hsH7F8YiF6H12DaM= github.com/ONSdigital/dp-api-clients-go/v2 v2.251.0/go.mod h1:dgFDfz04qdFWCkWvnfac/kQAA2Sul0nFw4DxuIVkXjI= github.com/ONSdigital/dp-cache v0.3.0 h1:E0T3XVjpcl6PDHL/4Go9a+EGekIwwNsfL0MsSgNK/jM= @@ -40,12 +28,10 @@ github.com/ONSdigital/dp-net v1.2.0/go.mod h1:NinlaqcsPbIR+X7j5PXCl3UI5G2zCL041S github.com/ONSdigital/dp-net v1.4.1/go.mod h1:VK8dah+G0TeVO/Os/w17Rk4WM6hIGmdUXrm8fBWyC+g= github.com/ONSdigital/dp-net v1.5.0 h1:H47O5N+eXyXCYqPoQGWwuK12uLds3pCgzxpYwepg+bQ= github.com/ONSdigital/dp-net v1.5.0/go.mod h1:d/S4n6FJlQwmVIa2rnVt1HnAUgM8XsG0QEJBQp48uGg= -github.com/ONSdigital/dp-net/v2 v2.8.0 h1:jCh+YN/KgQyrSQem48ShMKFi2eqF75LLI675qa8kRFA= -github.com/ONSdigital/dp-net/v2 v2.8.0/go.mod h1:QKmA2VgtVo9f7SpG9vq+VaZ9YUhQg+DpqcZkYTYi8WM= github.com/ONSdigital/dp-net/v2 v2.8.1 h1:wnLJjlEUQK2Q1HOEBTddKB9KUGx63ZWXlWyVtYVZZJ0= github.com/ONSdigital/dp-net/v2 v2.8.1/go.mod h1:Ddv4BY/lShhhU/0y7tUnx8hu1Rd0EsRA03UUsOoKv4E= -github.com/ONSdigital/dp-renderer v1.58.2 h1:4mmlpZxH98P/JdcsKwBLylGOZxEfqUIj4HR3MIv3d1U= -github.com/ONSdigital/dp-renderer v1.58.2/go.mod h1:aEgUZoxxw4vy5QG/1WYid3ApbLkaakbyn3/CqIGR/yE= +github.com/ONSdigital/dp-renderer v1.62.0 h1:RMIYXulgOICDKz0SivAgcpUsECIVYyNOP3rH2rgss0U= +github.com/ONSdigital/dp-renderer v1.62.0/go.mod h1:aEgUZoxxw4vy5QG/1WYid3ApbLkaakbyn3/CqIGR/yE= github.com/ONSdigital/dp-topic-api v0.15.0 h1:I7tWhUnx2ufqaaqDd/n4qAUAKX1Y7iDwVx2DORwrj7M= github.com/ONSdigital/dp-topic-api v0.15.0/go.mod h1:QDnwETsWELwCSK1yHj1VgYAxhgU3LpBC8Xu4WHPglcI= github.com/ONSdigital/go-ns v0.0.0-20191104121206-f144c4ec2e58/go.mod h1:iWos35il+NjbvDEqwtB736pyHru0MPFE/LqcwkV1wDc= @@ -65,8 +51,6 @@ github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejn github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/aws/aws-sdk-go v1.38.15/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.44.204 h1:7/tPUXfNOHB390A63t6fJIwmlwVQAkAwcbzKsU2/6OQ= -github.com/aws/aws-sdk-go v1.44.204/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.232 h1:rZ9gv+v7GAcWspk1JMa28L3XamRwoiMzD1vphUIm8Xg= github.com/aws/aws-sdk-go v1.44.232/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/c2h5oh/datasize v0.0.0-20200825124411-48ed595a09d2/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= @@ -78,8 +62,6 @@ github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9/go.mod h1:uPmA github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= -github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -126,8 +108,6 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= @@ -178,8 +158,6 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -209,8 +187,6 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -222,8 +198,6 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/handlers/clients.go b/handlers/clients.go index eea8fa7..b76b803 100644 --- a/handlers/clients.go +++ b/handlers/clients.go @@ -58,7 +58,6 @@ type PopulationClient interface { GetBlockedAreaCount(ctx context.Context, input population.GetBlockedAreaCountInput) (*cantabular.GetBlockedAreaCountResult, error) GetDimensionCategories(ctx context.Context, input population.GetDimensionCategoryInput) (population.GetDimensionCategoriesResponse, error) GetDimensionsDescription(ctx context.Context, input population.GetDimensionsDescriptionInput) (population.GetDimensionsResponse, error) - GetParentAreaCount(ctx context.Context, input population.GetParentAreaCountInput) (int, error) GetCategorisations(ctx context.Context, input population.GetCategorisationsInput) (population.GetCategorisationsResponse, error) GetPopulationType(ctx context.Context, input population.GetPopulationTypeInput) (population.GetPopulationTypeResponse, error) GetPopulationTypes(ctx context.Context, input population.GetPopulationTypesInput) (population.GetPopulationTypesResponse, error) diff --git a/handlers/filter_output.go b/handlers/filter_output.go index 87621b4..07dc2b5 100644 --- a/handlers/filter_output.go +++ b/handlers/filter_output.go @@ -42,7 +42,7 @@ func filterOutput(w http.ResponseWriter, req *http.Request, zc ZebedeeClient, dc var filterOutput filter.Model var dimDescriptions population.GetDimensionsResponse var sdc *cantabular.GetBlockedAreaCountResult - var areaTypeID, parent, supVar string + var areaTypeID, parent string var dimCategories population.GetDimensionCategoriesResponse var pop population.GetPopulationTypeResponse var dimIds, nonAreaDimIds, areaOpts []string @@ -309,30 +309,6 @@ func filterOutput(w http.ResponseWriter, req *http.Request, zc ZebedeeClient, dc return nil, 0, fmt.Errorf("failed to get dimension areas") } areaOpts = optsIDs - if dim.FilterByParent != "" { - count, err := pc.GetParentAreaCount(ctx, population.GetParentAreaCountInput{ - AuthTokens: population.AuthTokens{ - UserAuthToken: userAccessToken, - }, - PopulationType: filterOutput.PopulationType, - AreaTypeID: dim.ID, - ParentAreaTypeID: dim.FilterByParent, - Areas: optsIDs, - SVarID: supVar, - }) - if err != nil { - log.Error(ctx, "failed to get parent area count", err, log.Data{ - "dataset_id": filterOutput.PopulationType, - "area_type_id": dim.ID, - "parent_area_type_id": dim.FilterByParent, - "areas": optsIDs, - "supplementary_variable_id": supVar, - }) - return nil, 0, nil - } - - totalCount = count - } return options, totalCount, nil } @@ -363,9 +339,6 @@ func filterOutput(w http.ResponseWriter, req *http.Request, zc ZebedeeClient, dc var fDims []model.FilterDimension for i := len(filterOutput.Dimensions) - 1; i >= 0; i-- { - if filterOutput.Dimensions[i].IsAreaType == nil || !*filterOutput.Dimensions[i].IsAreaType { - supVar = filterOutput.Dimensions[i].ID - } options, count, err := getOptions(filterOutput.Dimensions[i]) if err != nil { log.Error(ctx, "failed to get options for dimension", err, log.Data{"dimension_name": filterOutput.Dimensions[i].Name}) diff --git a/handlers/filter_output_test.go b/handlers/filter_output_test.go index ab62f39..44800a6 100644 --- a/handlers/filter_output_test.go +++ b/handlers/filter_output_test.go @@ -796,101 +796,6 @@ func TestFilterOutputHandler(t *testing.T) { EXPECT(). GetPopulationType(gomock.Any(), gomock.Any()). Return(population.GetPopulationTypeResponse{}, nil) - mockPc. - EXPECT(). - GetParentAreaCount(gomock.Any(), gomock.Any()). - Return(0, nil) - mockPc.EXPECT().GetDimensionCategories(ctx, gomock.Any()). - Return(population.GetDimensionCategoriesResponse{ - PaginationResponse: population.PaginationResponse{TotalCount: 1}, - Categories: mockDimensionCategories, - }, nil).AnyTimes() - - mockRend := NewMockRenderClient(mockCtrl) - mockRend. - EXPECT(). - NewBasePageModel(). - Return(coreModel.NewPage(cfg.PatternLibraryAssetsPath, cfg.SiteDomain)) - mockRend. - EXPECT(). - BuildPage(gomock.Any(), gomock.Any(), "census-landing") - - w := httptest.NewRecorder() - req := httptest.NewRequest("GET", "/datasets/12345/editions/2021/versions/1/filter-outputs/67890", nil) - - router := mux.NewRouter() - router.HandleFunc("/datasets/{datasetID}/editions/{editionID}/versions/{versionID}/filter-outputs/{filterOutputID}", FilterOutput(mockZebedeeClient, mockFc, mockPc, mockDc, mockRend, cfg, "")) - - router.ServeHTTP(w, req) - Convey("Then the status code is 200", func() { - So(w.Code, ShouldEqual, http.StatusOK) - }) - }) - - Convey("and the pc.GetParentAreaCount fails", func() { - mockDc := NewMockDatasetClient(mockCtrl) - mockDc. - EXPECT(). - Get(ctx, userAuthToken, serviceAuthToken, collectionID, "12345"). - Return(dataset.DatasetDetails{ - Contacts: &[]dataset.Contact{{Name: "Nick"}}, - Type: "flexible", - URI: "/economy/grossdomesticproduct/datasets/gdpjanuary2018", - Links: dataset.Links{ - LatestVersion: dataset.Link{ - URL: "/datasets/12345/editions/2021/versions/1", - }, - }, - ID: "12345", - }, nil) - mockDc. - EXPECT(). - GetVersions(ctx, userAuthToken, serviceAuthToken, collectionID, "", "12345", "2021", &dataset.QueryParams{Offset: 0, Limit: 1000}). - Return(versions, nil) - mockDc. - EXPECT(). - GetVersion(ctx, userAuthToken, serviceAuthToken, collectionID, "", "12345", "2021", "1"). - Return(versions.Items[0], nil) - - mockFc := NewMockFilterClient(mockCtrl) - mockFc. - EXPECT(). - GetOutput(ctx, gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). - Return(filterModels[3], nil) - mockFc. - EXPECT(). - GetDimensionOptions(ctx, gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). - Return(filter.DimensionOptions{ - Items: []filter.DimensionOption{ - { - Option: "area 1", - }, - }, - TotalCount: 1, - }, "", nil) - - mockPc := NewMockPopulationClient(mockCtrl) - mockPc. - EXPECT(). - GetArea(gomock.Any(), gomock.Any()). - Return(population.GetAreaResponse{}, nil) - mockPc. - EXPECT(). - GetDimensionsDescription(ctx, gomock.Any()). - Return(population.GetDimensionsResponse{}, nil) - mockPc.EXPECT().GetCategorisations(ctx, gomock.Any()).Return(population.GetCategorisationsResponse{ - PaginationResponse: population.PaginationResponse{ - TotalCount: 2, - }, - }, nil).AnyTimes() - mockPc. - EXPECT(). - GetPopulationType(gomock.Any(), gomock.Any()). - Return(population.GetPopulationTypeResponse{}, nil) - mockPc. - EXPECT(). - GetParentAreaCount(gomock.Any(), gomock.Any()). - Return(0, errors.New("Internal error")) mockPc.EXPECT().GetDimensionCategories(ctx, gomock.Any()). Return(population.GetDimensionCategoriesResponse{ PaginationResponse: population.PaginationResponse{TotalCount: 1}, @@ -981,10 +886,6 @@ func TestFilterOutputHandler(t *testing.T) { EXPECT(). GetPopulationType(gomock.Any(), gomock.Any()). Return(population.GetPopulationTypeResponse{}, nil) - mockPc. - EXPECT(). - GetParentAreaCount(gomock.Any(), gomock.Any()). - Return(0, nil) mockRend := NewMockRenderClient(mockCtrl) mockRend. diff --git a/handlers/mock_clients.go b/handlers/mock_clients.go index 6379838..e7930e1 100644 --- a/handlers/mock_clients.go +++ b/handlers/mock_clients.go @@ -493,21 +493,6 @@ func (mr *MockPopulationClientMockRecorder) GetDimensionsDescription(ctx, input return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDimensionsDescription", reflect.TypeOf((*MockPopulationClient)(nil).GetDimensionsDescription), ctx, input) } -// GetParentAreaCount mocks base method. -func (m *MockPopulationClient) GetParentAreaCount(ctx context.Context, input population.GetParentAreaCountInput) (int, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetParentAreaCount", ctx, input) - ret0, _ := ret[0].(int) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetParentAreaCount indicates an expected call of GetParentAreaCount. -func (mr *MockPopulationClientMockRecorder) GetParentAreaCount(ctx, input interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetParentAreaCount", reflect.TypeOf((*MockPopulationClient)(nil).GetParentAreaCount), ctx, input) -} - // GetPopulationType mocks base method. func (m *MockPopulationClient) GetPopulationType(ctx context.Context, input population.GetPopulationTypeInput) (population.GetPopulationTypeResponse, error) { m.ctrl.T.Helper()