Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Typescript] add missing type mapping #973

Merged
merged 2 commits into from
Sep 6, 2018
Merged

[Typescript] add missing type mapping #973

merged 2 commits into from
Sep 6, 2018

Conversation

macjohnny
Copy link
Member

@macjohnny macjohnny commented Sep 5, 2018

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.3.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

Adds a missing type mapping
fixes #957

cc @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09)

@macjohnny
Copy link
Member Author

tested with the following definition

swagger: '2.0'
info:
  description: Test
  version: 1.0.0
  title: Test
host: localhost:8080
basePath: /v1
schemes:
  - http

# Path API Definitions
paths:
  /administration/stammdaten:
    post:
      consumes:
      - application/json
      parameters:
      - in: body
        name: body
        schema:
          type: object
          additionalProperties:
            type: object
            properties:
              code:
                type: integer
              text:
                type: string
      produces:
      - application/json
      responses:
        200:
          description: 'Successful operation'

# Data models
definitions:

  Stammdaten:
    type: object

    properties:

      modelMap:
        type: object
        additionalProperties:
          type: object
          properties:
            code:
              type: integer
            text:
              type: string

and configuration

{
  "supportES6": true,
  "providedInRoot": "true",
  "modelSuffix": "MySuffix",
  "serviceSuffix": "MySuffix",
  "ngVersion": "6.1.4"
}

to produce

import { StammdatenModelMapMySuffix } from './stammdatenModelMap';

export interface StammdatenMySuffix { 
    modelMap?: { [key: string]: StammdatenModelMapMySuffix; };
}

and

export interface StammdatenModelMapMySuffix { 
    code?: number;
    text?: string;
}

and

import { Inject, Injectable, Optional }                      from '@angular/core';
import { HttpClient, HttpHeaders, HttpParams,
         HttpResponse, HttpEvent }                           from '@angular/common/http';
import { CustomHttpUrlEncodingCodec }                        from '../encoder';

import { Observable }                                        from 'rxjs';


import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
import { Configuration }                                     from '../configuration';


@Injectable({
  providedIn: 'root'
})
export class DefaultMySuffix {
...
}

@macjohnny
Copy link
Member Author

@wing328 could you please review and merge this? it is a tiny change

@macjohnny macjohnny changed the title #957: add missing type mapping [Typescript][Angular] add missing type mapping Sep 5, 2018
@macjohnny macjohnny changed the title [Typescript][Angular] add missing type mapping [Typescript] add missing type mapping Sep 6, 2018
@wing328 wing328 added this to the 3.3.0 milestone Sep 6, 2018
Copy link
Member

@wing328 wing328 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wing328 wing328 merged commit b9e9f54 into OpenAPITools:master Sep 6, 2018
@wing328
Copy link
Member

wing328 commented Oct 2, 2018

@macjohnny thanks again for the PR, which is included in the v3.3.0 minor release: https://twitter.com/oas_generator/status/1046941449609068544

A-Joshi pushed a commit to ihsmarkitoss/openapi-generator that referenced this pull request Feb 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[angular-typescript] Bug generating model with suffix
3 participants