Skip to content

Codecrew / Moya

Go to a project
Commit 0562ac3a by Tuukka Kivilahti
Options

commit before mergin onja's changes

1 parent 4f6f5ef2
Inline Side-by-side
Showing with 278 additions and 134 deletions
code/moya-angular/.npmrc 0 → 100644
package-lock=false
code/moya-angular/package.json
......@@ -44,7 +44,7 @@
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.7.0",
"@angular-devkit/build-angular": "~0.7.2",
"@angular/cdk": "^6.4.2",
"@angular/cli": "6.1.2",
"@angular/compiler-cli": "6.1.1",
......
code/moya-angular/src/app/modules/viplist/models/vip-product-delivery.model.ts
/**
* Created by tuukka on 04/02/17.
*/
import gql from "graphql-tag";
export class VipProductDelivery {
/*
public Integer id;
public Integer delivererId;
public BigDecimal quantity;
public Date deliveryTime;
public String notes;
*/
static fragments = gql`
fragment vipProductDeliveryPrimitives on VipProductDelivery {
deliverytime
id
notes
quantity
}
`;
id: number;
delivererId: number;
......
code/moya-angular/src/app/modules/viplist/models/vip-product.model.ts
import {VipProductDelivery} from './vip-product-delivery.model';
import gql from "graphql-tag";
/**
* Created by tuukka on 04/02/17.
*/
......@@ -7,17 +8,14 @@ import {VipProductDelivery} from './vip-product-delivery.model';
export class VipProduct {
/*
public Integer id;
public String name;
public Integer productId;
public String notes;
public BigDecimal quantity;
public BigDecimal delivered;
public List<VipProductDeliveryPojo> deliveries = new ArrayList<>();
*/
static fragments = gql`
fragment vipProductPrimitives on VipProduct {
id
name
notes
quantity
}
`;
id: number;
name: string;
......
code/moya-angular/src/app/modules/viplist/models/vip.model.ts
import {VipProduct} from './vip-product.model';
import {User} from '../../../shared/models/user.model';
import gql from "graphql-tag";
import {VipProductDelivery} from "./vip-product-delivery.model";
/**
* Created by tuukka on 04/02/17.
*/
......@@ -8,17 +10,14 @@ import {User} from '../../../shared/models/user.model';
export class Vip {
/*
public Integer id;
public String description;
public String shortdescr;
public Date created;
public Integer eventuserId;
public Integer creatorId;
public Integer hostId;
public List<VipProductPojo> products = new ArrayList<>();
*/
static fragments = gql`
fragment vipPrimitives on Vip {
created
description
id
shortdescr
}
`;
id: number;
description: string;
......@@ -35,3 +34,9 @@ export class Vip {
}
}
export const VipFragmentsCombined = gql`
${Vip.fragments}
${VipProduct.fragments}
${VipProductDelivery.fragments}
`;
code/moya-angular/src/app/modules/viplist/viplist.service.ts
import {Injectable} from '@angular/core';
import {Vip} from './models/vip.model';
import {Vip, VipFragmentsCombined} from './models/vip.model';
import {User} from '../../shared/models/user.model';
import {UserService} from '../../shared/services/user.service';
import {Observable} from 'rxjs/Observable';
......@@ -9,11 +9,46 @@ import 'rxjs/add/observable/forkJoin';
import 'rxjs/add/operator/first';
import {HttpClient} from '@angular/common/http';
import {MOYA_REST_URL} from "../../shared/config/moya.config";
import gql from 'graphql-tag';
import {EventUser} from "../../shared/models/event-user.model";
import {Apollo} from "apollo-angular";
import "rxjs-compat/add/operator/map";
export const Q_VIPS_N_DATA = gql`
query Vips() {
vips {
...vipPrimitives
products {
...vipProductPrimitives
deliveries {
...vipProductDeliveryPrimitives
}
}
creator {
...eventUserPrimitives
user {
...userPrimitives
}
}
}
}
${VipFragmentsCombined}
${EventUser.fragments}
${User.fragments}
`;
@Injectable()
export class ViplistService {
constructor(private http: HttpClient, private userService: UserService) {
constructor(private apollo: Apollo, private http: HttpClient, private userService: UserService) {
}
......@@ -22,15 +57,19 @@ export class ViplistService {
* get vips
* @param searchString: searchString, skip to return all vips
*/
public get(searchString?: string): Observable<Array<Vip>> {
public get(): Observable<Array<Vip>> {
return this.apollo.watchQuery<Array<Vip>>({query: Q_VIPS_N_DATA}).valueChanges.map(x => x.data);
//Vip .map(x => x as Vip);
if (!searchString) {
return this.http.get(MOYA_REST_URL + 'v3/vip/all')
.switchMap(res => Observable.forkJoin(...(res as Array<any>).map(apiRow => this.hostPopulator(apiRow))));
}
return this.http.get(MOYA_REST_URL + 'v3/vip/search/' + searchString)
.switchMap(v => Observable.forkJoin(...(v as Array<any>).map(x => this.hostPopulator(x))));
}
......
code/moya-angular/src/app/shared/models/event-user.model.ts 0 → 100644
import {User} from "./user.model";
import gql from "graphql-tag";
export enum UserGender {
MALE,
FEMALE,
UNSPECIFIED
}
export class EventUser {
static fragments = gql`
fragment eventUserPrimitives on EventUser {
id
eventusercreated
}
`;
id: number;
eventusercreated: Date;
user: User;
constructor() { }
}
code/moya-angular/src/app/shared/models/user.model.ts
......@@ -4,6 +4,8 @@
// vim magic: %s/^\s*\w\+\s\+\(\w\+\)\s\+\(\w\+\)\s*.*;$/ \2: \L\1;/
import gql from "graphql-tag";
export enum UserGender {
MALE,
FEMALE,
......@@ -12,10 +14,33 @@ export enum UserGender {
export class User {
static fragments = gql`
fragment userPrimitives on User {
address
allergiesFreetext
birthday
email
firstnames
gender
id:
lastname
login
nick
phone
town
shirtSize
town
zip
}
`;
nick: string;
login: string;
eventuserId: number;
userId: number;
id: number;
firstname: string;
lastname: string;
password: string;
......@@ -23,12 +48,12 @@ export class User {
birthday: Date;
gender: UserGender;
phoneNumber: string;
phone: string;
email: string;
streetAddress: string;
zipCode: string;
postOffice: string;
zip: string;
town: string;
constructor() { }
......
code/moya-angular/tsconfig.json
......@@ -12,10 +12,11 @@
"node_modules/@types"
],
"lib": [
"es2017",
"dom"
"es2018",
"dom",
"esnext.asynciterable"
],
"module": "es2015",
"baseUrl": "./"
}
}
\ No newline at end of file
}
code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java
......@@ -626,6 +626,13 @@ public class BootstrapBean implements BootstrapBeanLocal {
"ALTER TABLE compo_voting_roles ADD CONSTRAINT FK_compo_voting_roles_scheme_id FOREIGN KEY (scheme_id) REFERENCES compo_voting_schemes (id)",
"ALTER TABLE compo_voting_roles ADD CONSTRAINT FK_compo_voting_roles_role_id FOREIGN KEY (role_id) REFERENCES roles (id)",
});
dbUpdates.add(new String[]{
"ALTER TABLE users DROP COLUMN postal_town;"
});
}
......
code/moya-database/src/main/java/fi/codecrew/moya/model/User.java
......@@ -96,9 +96,6 @@ public class User extends GenericEntity implements IUser {
@Column(name = "zip")
private String zip = "";
@Column(name = "postal_town")
private String postalTown = "";
@Column(name = "town")
private String town = "";
......
code/moya-web/src/main/java/fi/codecrew/moya/graphql/MoyaGraphQLServlet.java
......@@ -9,6 +9,7 @@ import fi.codecrew.moya.graphql.util.PropertyFetchWrapper;
import fi.codecrew.moya.model.*;
import fi.codecrew.moya.utilities.SearchQuery;
import fi.codecrew.moya.utilities.SearchResult;
import fi.codecrew.moya.utilities.jpa.ModelInterface;
import graphql.*;
import graphql.schema.*;
import graphql.schema.idl.SchemaPrinter;
......@@ -221,19 +222,19 @@ public class MoyaGraphQLServlet extends HttpServlet {
return stringWriter.toString();
}).description("Returns the object as a string.");
b.addField(Map.Entry.class)
.argument(newArgument().name("keys").defaultValue(Collections.emptyMap()).type(GraphQLList.list(GraphQLString)))
.name("path")
.description("Returngs values from given keys as key, value pairs")
.dataFetcher(environment -> {
Map<String, String> ret = new HashMap<>();
final JsonObject jsonObj = environment.getSource();
((List<String>) environment.getArgument("keys")).forEach(key -> {
if (jsonObj.containsKey(key)) ret.put(key, jsonObj.getString(key));
.argument(newArgument().name("keys").defaultValue(Collections.emptyMap()).type(GraphQLList.list(GraphQLString)))
.name("path")
.description("Returngs values from given keys as key, value pairs")
.dataFetcher(environment -> {
Map<String, String> ret = new HashMap<>();
final JsonObject jsonObj = environment.getSource();
((List<String>) environment.getArgument("keys")).forEach(key -> {
if (jsonObj.containsKey(key)) ret.put(key, jsonObj.getString(key));
});
return ret.entrySet();
});
return ret.entrySet();
});
}
{
EntityGQLBuilder<Role> b = builder.createEntity(Role.class);
......@@ -326,7 +327,7 @@ public class MoyaGraphQLServlet extends HttpServlet {
b.addField(User_.email);
b.addField(User_.address);
b.addField(User_.zip);
b.addField(User_.postalTown);
//b.addField(User_.postalTown);
b.addField(User_.town);
b.addField(User_.phone);
b.addField(User_.gender);
......@@ -334,25 +335,25 @@ public class MoyaGraphQLServlet extends HttpServlet {
b.addField().name("shirtSize").type(GraphQLString).dataFetcher(new JSONPropertyDataFetcher("meta", "shirtSize"));
b.addField().name("allergiesFreetext").type(GraphQLString).dataFetcher(new JSONPropertyDataFetcher("meta", "allergies"));
b.addListField(UsersAllergy.class)
.name("allergies")
.argument(newArgument()
.description("By default, show only allergies, user has selected")
.type(GraphQLBoolean)
.defaultValue(true)
.name("onlySelected"))
.dataFetcher(environment -> {
List<UsersAllergy> allergies = allergybean.getUserAllergies((User) environment.getSource());
logger.warn("Got allergies for user {}", allergies);
if (environment.getArgument("onlySelected")) {
logger.warn("Filtering allergies");
return allergies.stream().sorted(ENTITY_ID_SORTER).filter(a -> a.isSelected()).collect(toList());
}
return allergies;
});
.name("allergies")
.argument(newArgument()
.description("By default, show only allergies, user has selected")
.type(GraphQLBoolean)
.defaultValue(true)
.name("onlySelected"))
.dataFetcher(environment -> {
List<UsersAllergy> allergies = allergybean.getUserAllergies((User) environment.getSource());
logger.warn("Got allergies for user {}", allergies);
if (environment.getArgument("onlySelected")) {
logger.warn("Filtering allergies");
return allergies.stream().sorted(ENTITY_ID_SORTER).filter(a -> a.isSelected()).collect(toList());
}
return allergies;
});
b.addListField(EventUser.class)
.dataFetcher(environment -> userbean.findAllEventusers(environment.getSource()).stream().sorted(ENTITY_ID_SORTER).collect(toList()))
.description("Only users themselves can fetch eventusers for other events. If another user tries to fetch this data, an exception will be thrown");
.dataFetcher(environment -> userbean.findAllEventusers(environment.getSource()).stream().sorted(ENTITY_ID_SORTER).collect(toList()))
.description("Only users themselves can fetch eventusers for other events. If another user tries to fetch this data, an exception will be thrown");
}
......@@ -367,9 +368,9 @@ public class MoyaGraphQLServlet extends HttpServlet {
b.addField(UsersAllergy_.selected);
b.addField().type(GraphQLString)
.name("allergyname")
.dataFetcher(environment -> ((UsersAllergy) environment.getSource()).getAllergy().getName().getDefaultValue())
.description("Shorthand for { allergy {name {defaultvalue}}}");
.name("allergyname")
.dataFetcher(environment -> ((UsersAllergy) environment.getSource()).getAllergy().getName().getDefaultValue())
.description("Shorthand for { allergy {name {defaultvalue}}}");
}
{
......@@ -473,6 +474,29 @@ public class MoyaGraphQLServlet extends HttpServlet {
{
EntityGQLBuilder<VipProduct> b = builder.createEntity(VipProduct.class);
b.addField(VipProduct_.id);
b.addField(VipProduct_.deliveries);
b.addField(VipProduct_.name);
b.addField(VipProduct_.notes);
b.addField(VipProduct_.product);
b.addField(VipProduct_.quantity);
b.addField(VipProduct_.vip);
}
{
EntityGQLBuilder<VipProductDelivery> b = builder.createEntity(VipProductDelivery.class);
b.addField(VipProductDelivery_.id);
b.addField(VipProductDelivery_.deliverer);
b.addField(VipProductDelivery_.deliveryTime);
b.addField(VipProductDelivery_.notes);
b.addField(VipProductDelivery_.quantity);
b.addField(VipProductDelivery_.vipProduct);
}
{
EntityGQLBuilder<LanEvent> b = builder.createEntity(SIMPLE_EVENT_TYPE_NAME);
b.addField(LanEvent_.id);
......@@ -505,6 +529,7 @@ public class MoyaGraphQLServlet extends HttpServlet {
{
EntityGQLBuilder<CompoEntry> b = builder.createEntity(CompoEntry.class);
b.addField(CompoEntry_.id);
b.addField(CompoEntry_.created);
b.addField(CompoEntry_.creator);
......@@ -559,16 +584,6 @@ public class MoyaGraphQLServlet extends HttpServlet {
b.addField(LanEvent_.ticketSalesBegin);
b.addField(LanEvent_.domains);
b.addField(LanEvent_.meta);
b.addListField(EventMap.class).dataFetcher(environment -> placebean.getMaps().stream().sorted(ENTITY_ID_SORTER).collect(toList()));
b.addListField(Role.class).dataFetcher(environment -> rolebean.listRoles().stream().sorted(ENTITY_ID_SORTER).collect(toList()));
b.addListField(Product.class).dataFetcher(environment -> productbean.findProductsForEvent().stream().sorted(ENTITY_ID_SORTER).collect(toList()));
b.addListField(Compo.class).dataFetcher(environment -> votebean.getCompoList(true).stream().sorted(ENTITY_ID_SORTER).collect(toList()));
b.addField(LanEvent_.id);
b.addListField(Vip.class).dataFetcher(enviroment -> vipBean.getAvailableVips());
}
return builder;
}
......@@ -580,10 +595,37 @@ public class MoyaGraphQLServlet extends HttpServlet {
schemaBld.additionalTypes(builder.getTypes());
schemaBld.query(GraphQLObjectType.newObject()
.name("moyaQuery")
.field(getUserSearchField(builder))
.field(getEventSearchQuery(builder))
.field(getSingleUserQuery(builder)));
.name("moyaQuery")
.field(getUserSearchField(builder))
.field(getEventSearchQuery(builder))
.field(getSingleUserQuery(builder))
.field(
newFieldDefinition()
.name("eventmaps")
.type(GraphQLList.list(builder.typeFor(EventMap.class)))
.dataFetcher(environment -> placebean.getMaps().stream().sorted(ENTITY_ID_SORTER).collect(toList())))
.field(
newFieldDefinition()
.name("roles")
.type(GraphQLList.list(builder.typeFor(Role.class)))
.dataFetcher(environment -> rolebean.listRoles().stream().sorted(ENTITY_ID_SORTER).collect(toList())))
.field(
newFieldDefinition()
.name("products")
.type(GraphQLList.list(builder.typeFor(Product.class)))
.dataFetcher(environment -> productbean.findProductsForEvent().stream().sorted(ENTITY_ID_SORTER).collect(toList())))
.field(
newFieldDefinition()
.name("compos")
.type(GraphQLList.list(builder.typeFor(Compo.class)))
.dataFetcher(environment -> votebean.getCompoList(true).stream().sorted(ENTITY_ID_SORTER).collect(toList())))
.field(
newFieldDefinition()
.name("vips")
.type(GraphQLList.list(builder.typeFor(Vip.class)))
.dataFetcher(environment -> vipBean.getAvailableVips()))
);
return schemaBld.build();
......@@ -592,63 +634,63 @@ public class MoyaGraphQLServlet extends HttpServlet {
private GraphQLFieldDefinition getSingleUserQuery(GraphQLBuilder builder) {
return newFieldDefinition()
.name("user")
.argument(newArgument().name("id").type(GraphQLInt).description("Id of the global user object. If id is 0, currently logged in user is used"))
.type(builder.typeFor(User.class))
.dataFetcher(environment -> {
Integer id = environment.getArgument("userId");
EventUser user;
if (id == null || id.equals(0)) {
user = permbean.getCurrentUser();
} else {
user = userbean.findByUserId(id, false);
}
if (user == null) {
throw new NullPointerException("User not found with id " + id);
}
return user.getUser();
}).build();
.name("user")
.argument(newArgument().name("id").type(GraphQLInt).description("Id of the global user object. If id is 0, currently logged in user is used"))
.type(builder.typeFor(User.class))
.dataFetcher(environment -> {
Integer id = environment.getArgument("userId");
EventUser user;
if (id == null || id.equals(0)) {
user = permbean.getCurrentUser();
} else {
user = userbean.findByUserId(id, false);
}
if (user == null) {
throw new NullPointerException("User not found with id " + id);
}
return user.getUser();
}).build();
}
private GraphQLFieldDefinition.Builder getEventSearchQuery(GraphQLBuilder builder) {
return newFieldDefinition()
.name("currentevent")
.type(builder.typeFor(LanEvent.class))
.dataFetcher(environment -> eventbean.getCurrentEvent());
.name("currentevent")
.type(builder.typeFor(LanEvent.class))
.dataFetcher(environment -> eventbean.getCurrentEvent());
}
private GraphQLFieldDefinition.Builder getUserSearchField(GraphQLBuilder builder) {
return newFieldDefinition()
.type(new GraphQLList(builder.typeFor(EventUser.class)))
.name("usersearch")
.description("Search users. Using this method requires admin acccess to the database")
//.argument(newArgument().name("reason").type(GraphQLString).description("Reason for the data request. Reason and requested fields are stored to audit log."))
.argument(newArgument().name("roles").defaultValue(Collections.emptyList()).description("(Optional) Filter users that belong to a role").type(GraphQLList.list(GraphQLInt)))
.argument(newArgument().name("search").type(GraphQLString).defaultValue("").description("(Optional) Filter users that contain the search parameter in their firstname, lastname, nick or email").type(GraphQLString))
.argument(newArgument().name("page").type(GraphQLInt).defaultValue(0).description("Pagination page ( 0 is the first page)"))
.argument(newArgument().name("pagesize").type(GraphQLInt).defaultValue(0).description("Pagination pagesize (0 disables pagination)"))
.dataFetcher((DataFetcher<List<EventUser>>) environment -> {
.type(new GraphQLList(builder.typeFor(EventUser.class)))
.name("usersearch")
.description("Search users. Using this method requires admin acccess to the database")
//.argument(newArgument().name("reason").type(GraphQLString).description("Reason for the data request. Reason and requested fields are stored to audit log."))
.argument(newArgument().name("roles").defaultValue(Collections.emptyList()).description("(Optional) Filter users that belong to a role").type(GraphQLList.list(GraphQLInt)))
.argument(newArgument().name("search").type(GraphQLString).defaultValue("").description("(Optional) Filter users that contain the search parameter in their firstname, lastname, nick or email").type(GraphQLString))
.argument(newArgument().name("page").type(GraphQLInt).defaultValue(0).description("Pagination page ( 0 is the first page)"))
.argument(newArgument().name("pagesize").type(GraphQLInt).defaultValue(0).description("Pagination pagesize (0 disables pagination)"))
.dataFetcher((DataFetcher<List<EventUser>>) environment -> {
/*
String reason = environment.getArgument("reason");
if (reason == null || reason.isEmpty()) {
throw new GRPDException("Query did not provide a reason for the request");
}*/
UserSearchQuery query = new UserSearchQuery(environment.getArgument("page"), environment.getArgument("pagesize"), null, null, SearchQuery.QuerySortOrder.UNSORTED);
UserSearchQuery query = new UserSearchQuery(environment.getArgument("page"), environment.getArgument("pagesize"), null, null, SearchQuery.QuerySortOrder.UNSORTED);
String searchArg = environment.getArgument("search");
if (searchArg != null && !searchArg.isEmpty()) {
query.setSearch(searchArg);
}
String searchArg = environment.getArgument("search");
if (searchArg != null && !searchArg.isEmpty()) {
query.setSearch(searchArg);
}
List<Integer> roleArgument = environment.getArgument("roles");
if (roleArgument != null && !roleArgument.isEmpty()) {
query.setFilterRoles(roleArgument.stream().map(id -> rolebean.find(id)).filter(x -> x != null).collect(toList()));
}
List<Integer> roleArgument = environment.getArgument("roles");
if (roleArgument != null && !roleArgument.isEmpty()) {
query.setFilterRoles(roleArgument.stream().map(id -> rolebean.find(id)).filter(x -> x != null).collect(toList()));
}
SearchResult<EventUser> ret = userbean.getThisEventsUsers(query);
return ret.getResults();
});
SearchResult<EventUser> ret = userbean.getThisEventsUsers(query);
return ret.getResults();
});
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!