Commit 163c0205 authored by Martin Lowe's avatar Martin Lowe 🇨🇦
Browse files

Merge branch 'malowe/dev/remove-short-desc' into 'dev'

Remove usage of short description in the organization info update call

See merge request !476
parents 6f4d18dd c7596656
Pipeline #1791 passed with stage
in 0 seconds
......@@ -1133,9 +1133,7 @@ components:
- object
- 'null'
properties:
short:
type: string
full:
long:
type: string
website:
type:
......
......@@ -68,9 +68,6 @@ public abstract class MemberOrganization {
@AutoValue
@JsonDeserialize(builder = AutoValue_MemberOrganization_MemberOrganizationDescription.Builder.class)
public abstract static class MemberOrganizationDescription {
@Nullable
@JsonProperty("short")
public abstract String getShortDescription();
@Nullable
@JsonProperty("long")
......@@ -83,9 +80,6 @@ public abstract class MemberOrganization {
@AutoValue.Builder
@JsonPOJOBuilder(withPrefix = "set")
public abstract static class Builder {
@Nullable
@JsonProperty("short")
public abstract Builder setShortDescription(String shortDescription);
@Nullable
@JsonProperty("long")
......
......@@ -171,7 +171,6 @@ public class OrganizationResource extends AbstractRESTResource {
infoRef = infoRefs.get(0);
}
infoRef.setCompanyUrl(updateRequest.getCompanyUrl());
infoRef.setShortDescription(updateRequest.getDescription());
infoRef.setLongDescription(updateRequest.getDescription());
// update the org info
......
......@@ -345,7 +345,6 @@ public class FoundationDBOrganizationService implements OrganizationsService {
// retrieve the descriptions of the organization
MemberOrganizationDescription.Builder desc = MemberOrganizationDescription.builder();
desc.setLongDescription(info.getLongDescription());
desc.setShortDescription(info.getShortDescription());
out.setDescription(desc.build());
out.setWebsite(info.getCompanyUrl());
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment