-

Explore

+

Explore

{{place}}

@@ -25,4 +25,7 @@
+ + +
  • Index: trip-planner-front/src/app/explore/explore-result/explore-result.component.ts =================================================================== --- trip-planner-front/src/app/explore/explore-result/explore-result.component.ts (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner-front/src/app/explore/explore-result/explore-result.component.ts (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -17,4 +17,18 @@ } + responsiveOptions:any[] = [ + { + breakpoint: '1024px', + numVisible: 5 + }, + { + breakpoint: '768px', + numVisible: 3 + }, + { + breakpoint: '560px', + numVisible: 1 + } +]; ngOnInit(): void { this.route.queryParams @@ -25,6 +39,6 @@ this.locationService.getAllLocationsSearch(this.place).subscribe( - data => { - this.allLocation = data; + res => { + this.allLocation = res; } ) Index: trip-planner-front/src/app/location/add-location/add-location.component.css =================================================================== --- trip-planner-front/src/app/location/add-location/add-location.component.css (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) +++ trip-planner-front/src/app/location/add-location/add-location.component.css (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -0,0 +1,23 @@ +.example-form { + min-width: 150px; + max-width: 380px; + width: 100%; + } + + .example-full-width { + width: 100%; + } + + mat-icon { + height: 20px; + width: 20px; + font-size: 20px; + margin-right: 5px; + } + button{ + float: right; + } + + .yellow{ + background-color:yellow; + } Index: trip-planner-front/src/app/location/add-location/add-location.component.html =================================================================== --- trip-planner-front/src/app/location/add-location/add-location.component.html (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) +++ trip-planner-front/src/app/location/add-location/add-location.component.html (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -0,0 +1,110 @@ + + +
    + Location properties + + Name + + + + + Description + + + + + Address + + + + + Duration + + + + + Trivia + + + + + Priority + + + {{priority.viewValue}} + + + + + + + Please select a city + + {{city.name}} + + + + + + Please select a region + + {{region.name}} + + + + + + +
    + +
    +
    +     + +
    + Add companion for the location + + Companion + + + {{companionForm.value ? companionForm.value[0] : ''}} + + (+{{companionForm.value.length - 1}} {{companionForm.value?.length === 2 ? 'other' : 'others'}}) + + + {{companion.type}} + + +
    + +
    +
    +     + + +
    + Add categories for the location + + + check + {{category.name}} + + +
    + +
    +
    +     + + Done +

    You are now done.

    +
    + +
    +     +     Index: trip-planner-front/src/app/location/add-location/add-location.component.ts =================================================================== --- trip-planner-front/src/app/location/add-location/add-location.component.ts (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) +++ trip-planner-front/src/app/location/add-location/add-location.component.ts (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -0,0 +1,148 @@ +import { Component, OnInit } from '@angular/core'; +import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatChip } from '@angular/material/chips'; +import { Category } from 'src/app/_models/category'; +import { City } from 'src/app/_models/city'; +import { Companion } from 'src/app/_models/companion'; +import { LocationDto } from 'src/app/_models/dto/locationDto'; +import { Region } from 'src/app/_models/region'; +import { CategoryService } from 'src/app/_services/cateogry.service'; +import { CityService } from 'src/app/_services/city.service'; +import { CompanionService } from 'src/app/_services/companion.service'; +import { LocationService } from 'src/app/_services/location.service'; +import { RegionService } from 'src/app/_services/region.service'; + +@Component({ + selector: 'app-add-location', + templateUrl: './add-location.component.html', + styleUrls: ['./add-location.component.css'] +}) +export class AddLocationComponent implements OnInit { + firstFormGroup: FormGroup; + secondFormGroup: FormGroup; + thirdFormGroup : FormGroup; + isEditable = false; + categories : Category[] = []; + companions : Companion[] = []; + cities : City[] = []; + cityId : number = 0; + regionId : number = 0; + regions : Region[] = []; + priority: string = ''; + name: string = ''; + desc: string = ''; + address: string = ''; + duration: number = 0; + trivia: string = ''; + isCompleted = false; + locationDto : LocationDto = new LocationDto(); + companionForm = new FormControl(); + chipsSeletion: number[] = []; + toggle = true; + isCompletedSecond = false; + + priorities: any[] = [ + {value: 'high', viewValue: 'High'}, + {value: 'medium', viewValue: 'Medium'}, + {value: 'low', viewValue: 'Low'}, + ]; + + constructor(private fb: FormBuilder, private categoryService : CategoryService, + private companionService : CompanionService, private cityService : CityService, private regionService : RegionService, + private locationService : LocationService) { + this.firstFormGroup = fb.group({ + title: fb.control('initial value', Validators.required) + }); + this.secondFormGroup = fb.group({ + title: fb.control('initial value', Validators.required) + }); + this.thirdFormGroup = fb.group({ + title: fb.control('initial value', Validators.required) + + }) + } + + ngOnInit() { + this.firstFormGroup = this.fb.group({ + name: ['', Validators.required], + desc: ['', Validators.required], + address: ['', Validators.required], + priority: ['', Validators.required], + trivia: ['', Validators.required], + duration: ['', Validators.required], + }); + + this.secondFormGroup = this.fb.group({ + secondCtrl: ['', Validators.required], + }); + + this.categoryService.getAllCategories().subscribe( + data => { + this.categories = data; + } + ); + + this.companionService.getAllCompanions().subscribe( + data => { + this.companions = data; + } + ); + + + this.cityService.getAllCities().subscribe( + data => { + this.cities = data; + } + ); + + this.regionService.getAllRegions().subscribe( + data => { + this.regions = data; + } + ); + } + + submitLocation(){ + this.locationDto.name = this.name; + this.locationDto.description = this.desc; + this.locationDto.address = this.address; + this.locationDto.duration = this.duration; + this.locationDto.trivia = this.trivia; + this.locationDto.priority = this.priority; + this.locationDto.city = this.cityId; + this.locationDto.region = this.regionId; + if(this.name !== null && this.desc !== null && this.address !== null + && this.trivia != null && this.priority !== null && this.cityId !== 0 && this.regionId !== 0){ + this.isCompleted = true; + + this.locationService.save(this.locationDto).subscribe( + data => { + console.log(data); + } + ); + + } + } + + toggleSelection(chip: MatChip, category: Category) { + chip.toggleSelected(); + + if (this.chipsSeletion.length > 0) { + if (this.chipsSeletion.indexOf(category.id) <= -1) { + this.chipsSeletion.push(category.id); + } else { + const index = this.chipsSeletion.indexOf(category.id); + this.chipsSeletion.splice(index, 1); + } + } else { + this.chipsSeletion.push(category.id); + } + console.log(this.chipsSeletion); + } + onClickSecondForm(){ + if(this.companionForm.value.length >= 1){ + this.isCompletedSecond = true; + } + console.log(this.companionForm.value.length) + } +} Index: trip-planner-front/src/app/location/location-details/location-details.component.ts =================================================================== --- trip-planner-front/src/app/location/location-details/location-details.component.ts (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner-front/src/app/location/location-details/location-details.component.ts (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -1,4 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { Images } from 'src/app/_models/images'; import { Location } from 'src/app/_models/location'; @@ -17,5 +17,5 @@ images: Images[]; - constructor(private route: ActivatedRoute, private router: Router, private locationService: LocationService, + constructor(private route: ActivatedRoute, private locationService: LocationService, private imagesService: ImagesService) { this.locationId = 1; Index: trip-planner-front/src/app/locations-form/locations-form.component.html =================================================================== --- trip-planner-front/src/app/locations-form/locations-form.component.html (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner-front/src/app/locations-form/locations-form.component.html (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -35,5 +35,5 @@ Please select a region - {{region.name}} + {{region.name}} Index: trip-planner-front/src/app/planner/planner.component.html =================================================================== --- trip-planner-front/src/app/planner/planner.component.html (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner-front/src/app/planner/planner.component.html (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -13,4 +13,5 @@ +
    Index: trip-planner-front/src/app/planner/planner.component.ts =================================================================== --- trip-planner-front/src/app/planner/planner.component.ts (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner-front/src/app/planner/planner.component.ts (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -99,3 +99,7 @@ window.location.reload(); } + + onClickAddLocation(){ + this.router.navigate(['add-location']); + } } Index: trip-planner/src/main/java/finki/diplomska/tripplanner/models/Location.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/models/Location.java (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner/src/main/java/finki/diplomska/tripplanner/models/Location.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -14,5 +14,4 @@ @Entity @Table(name = "locations") -@NoArgsConstructor @AllArgsConstructor @Getter @@ -65,4 +64,8 @@ private List plannerList; + @ManyToOne + @JsonBackReference + @JoinColumn(name = "id_user") + private User user; @ManyToMany @@ -74,9 +77,22 @@ private List categoryList; - @OneToMany(mappedBy = "location", cascade = CascadeType.REMOVE, orphanRemoval = true) @JsonManagedReference private List imagesList; + public Location(String name, String description, String address, String priority, int duration, String trivia, byte[] photo, Region region, City city, User user) { + this.name = name; + this.description = description; + this.address = address; + this.priority = priority; + this.duration = duration; + this.trivia = trivia; + this.photo = photo; + this.region = region; + this.city = city; + this.user = user; + } + public Location() { + } } Index: ip-planner/src/main/java/finki/diplomska/tripplanner/models/Period.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/models/Period.java (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ (revision ) @@ -1,8 +1,0 @@ -package finki.diplomska.tripplanner.models; - -import javax.persistence.Embeddable; - -@Embeddable -public class Period { - private String period; -} Index: trip-planner/src/main/java/finki/diplomska/tripplanner/models/User.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/models/User.java (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner/src/main/java/finki/diplomska/tripplanner/models/User.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -2,4 +2,5 @@ import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonManagedReference; import lombok.AllArgsConstructor; import lombok.Getter; @@ -44,4 +45,8 @@ @JsonIgnore private List planners = new ArrayList<>(); + + @OneToMany(cascade = CascadeType.REFRESH, mappedBy = "user", orphanRemoval = true) + @JsonIgnore + private List locationList = new ArrayList<>();; public User() { Index: trip-planner/src/main/java/finki/diplomska/tripplanner/models/dto/LocationDto.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/models/dto/LocationDto.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) +++ trip-planner/src/main/java/finki/diplomska/tripplanner/models/dto/LocationDto.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -0,0 +1,53 @@ +package finki.diplomska.tripplanner.models.dto; + +import finki.diplomska.tripplanner.models.*; +import lombok.Data; + +import java.util.List; + +@Data +public class LocationDto { + + private String name; + + private String description; + + private String address; + + private String priority; + + private int duration; + + private String trivia; + + private byte[] photo; + + private Long region; + + private Long city; + + private String user; + + private List companions; + + private List categories; + + + public LocationDto(String name, String description, String address, String priority, int duration, String trivia, byte[] photo, Long region, Long city, String user ) { + this.name = name; + this.description = description; + this.address = address; + this.priority = priority; + this.duration = duration; + this.trivia = trivia; + this.photo = photo; + this.region = region; + this.city = city; + this.user = user; + this.companions = companions; + this.categories = categories; + } + + public LocationDto() { + } +} Index: trip-planner/src/main/java/finki/diplomska/tripplanner/models/exceptions/CityNotFoundException.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/models/exceptions/CityNotFoundException.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) +++ trip-planner/src/main/java/finki/diplomska/tripplanner/models/exceptions/CityNotFoundException.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -0,0 +1,10 @@ +package finki.diplomska.tripplanner.models.exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.NOT_FOUND) +public class CityNotFoundException extends RuntimeException{ + public CityNotFoundException(Long id) {super(String.format("City with id %d is not found", id));} + +} Index: trip-planner/src/main/java/finki/diplomska/tripplanner/models/exceptions/CompanionNotFoundException.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/models/exceptions/CompanionNotFoundException.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) +++ trip-planner/src/main/java/finki/diplomska/tripplanner/models/exceptions/CompanionNotFoundException.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -0,0 +1,10 @@ +package finki.diplomska.tripplanner.models.exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.NOT_FOUND) +public class CompanionNotFoundException extends RuntimeException{ + public CompanionNotFoundException(Long id) {super(String.format("Companion with id %d is not found", id));} + +} Index: trip-planner/src/main/java/finki/diplomska/tripplanner/models/exceptions/RegionNotFoundException.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/models/exceptions/RegionNotFoundException.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) +++ trip-planner/src/main/java/finki/diplomska/tripplanner/models/exceptions/RegionNotFoundException.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -0,0 +1,9 @@ +package finki.diplomska.tripplanner.models.exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.NOT_FOUND) +public class RegionNotFoundException extends RuntimeException{ + public RegionNotFoundException(Long id){super(String.format("Region with id %d is not found", id));} +} Index: trip-planner/src/main/java/finki/diplomska/tripplanner/security/SecurityConfig.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/security/SecurityConfig.java (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner/src/main/java/finki/diplomska/tripplanner/security/SecurityConfig.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -81,4 +81,9 @@ .antMatchers("/api/all").permitAll() .antMatchers("/api/places").permitAll() + .antMatchers("/create/planner").permitAll() + .antMatchers("/create/planner/{id}").permitAll() + .antMatchers("/create/locations").permitAll() + .antMatchers("/create/trip/locations").permitAll() + .antMatchers("/create").permitAll() .anyRequest().authenticated(); http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class); Index: trip-planner/src/main/java/finki/diplomska/tripplanner/service/LocationService.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/service/LocationService.java (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner/src/main/java/finki/diplomska/tripplanner/service/LocationService.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -4,4 +4,5 @@ import finki.diplomska.tripplanner.models.Location; import finki.diplomska.tripplanner.models.Planner; +import finki.diplomska.tripplanner.models.dto.LocationDto; import finki.diplomska.tripplanner.models.dto.PlannerLocationDto; import org.springframework.data.repository.query.Param; @@ -26,3 +27,4 @@ List getAllLocationIdsForPlanner(Long plannerId); List getAllLocations(String place); + Optional save (LocationDto locationDto, String username); } Index: trip-planner/src/main/java/finki/diplomska/tripplanner/service/impl/LocationServiceImpl.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/service/impl/LocationServiceImpl.java (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner/src/main/java/finki/diplomska/tripplanner/service/impl/LocationServiceImpl.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -1,10 +1,12 @@ package finki.diplomska.tripplanner.service.impl; -import finki.diplomska.tripplanner.models.Location; -import finki.diplomska.tripplanner.models.Planner; +import finki.diplomska.tripplanner.models.*; +import finki.diplomska.tripplanner.models.dto.LocationDto; import finki.diplomska.tripplanner.models.dto.PlannerLocationDto; +import finki.diplomska.tripplanner.models.exceptions.CityNotFoundException; +import finki.diplomska.tripplanner.models.exceptions.CompanionNotFoundException; import finki.diplomska.tripplanner.models.exceptions.LocationNotFoundException; -import finki.diplomska.tripplanner.repository.jpa.JpaLocationRepository; -import finki.diplomska.tripplanner.repository.jpa.JpaPlannerRepository; +import finki.diplomska.tripplanner.models.exceptions.RegionNotFoundException; +import finki.diplomska.tripplanner.repository.jpa.*; import finki.diplomska.tripplanner.service.LocationService; import org.springframework.stereotype.Service; @@ -19,8 +21,18 @@ private final JpaLocationRepository locationRepository; private final JpaPlannerRepository plannerRepository; - - public LocationServiceImpl(JpaLocationRepository locationRepository, JpaPlannerRepository plannerRepository) { + private final JpaRegionRepository regionRepository; + private final JpaCityRepository cityRepository; + private final JpaUserRepository userRepository; + private final JpaCategoryRepository categoryRepository; + private final JpaCompanionRepository companionRepository; + + public LocationServiceImpl(JpaLocationRepository locationRepository, JpaPlannerRepository plannerRepository, JpaRegionRepository regionRepository, JpaCityRepository cityRepository, JpaUserRepository userRepository, JpaCategoryRepository categoryRepository, JpaCompanionRepository companionRepository) { this.locationRepository = locationRepository; this.plannerRepository = plannerRepository; + this.regionRepository = regionRepository; + this.cityRepository = cityRepository; + this.userRepository = userRepository; + this.categoryRepository = categoryRepository; + this.companionRepository = companionRepository; } @@ -151,5 +163,4 @@ } } - return newList; } @@ -189,4 +200,20 @@ } + @Override + public Optional save(LocationDto locationDto, String username) { + City city = new City(); + Region region = this.regionRepository.findById(locationDto.getRegion()) + .orElseThrow(() -> new RegionNotFoundException(locationDto.getRegion())); + if(locationDto.getCity() != null){ + city = this.cityRepository.findById(locationDto.getCity()) + .orElseThrow(() -> new CityNotFoundException(locationDto.getCity())); + }else{ + city = null; + } + User user = this.userRepository.findByUsername(username); + locationDto.setUser(user.getUsername()); + return Optional.of(this.locationRepository.save(new Location(locationDto.getName(), locationDto.getDescription(), locationDto.getAddress(), locationDto.getPriority(), + locationDto.getDuration(), locationDto.getTrivia(), locationDto.getPhoto(), region, city, user))); + } } Index: trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/LocationRestController.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/LocationRestController.java (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/LocationRestController.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -2,8 +2,11 @@ import finki.diplomska.tripplanner.models.Location; +import finki.diplomska.tripplanner.models.User; +import finki.diplomska.tripplanner.models.dto.LocationDto; import finki.diplomska.tripplanner.models.dto.PlannerLocationDto; import finki.diplomska.tripplanner.service.LocationService; import finki.diplomska.tripplanner.service.PlannerService; import org.springframework.http.ResponseEntity; +import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.*; @@ -82,3 +85,10 @@ } + @PostMapping("/add") + public ResponseEntity save(@RequestBody LocationDto locationDto, Authentication authentication) { + User user = (User) authentication.getPrincipal(); + return this.locationService.save(locationDto, user.getUsername()) + .map(location -> ResponseEntity.ok().body(location)) + .orElseGet(() -> ResponseEntity.badRequest().build()); + } } Index: trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/PlannerRestController.java =================================================================== --- trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/PlannerRestController.java (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/PlannerRestController.java (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -69,5 +69,4 @@ @ResponseStatus(HttpStatus.CREATED) public ResponseEntity newPlanner(@Valid @RequestBody PlannerDto plannerDto, Authentication authentication) { - User user = (User) authentication.getPrincipal(); return this.plannerService.newPlanner(plannerDto, user.getUsername()) Index: trip-planner/src/test/api.http =================================================================== --- trip-planner/src/test/api.http (revision 76712b2bf7daeb245c9ca388ce322e0b98098d99) +++ trip-planner/src/test/api.http (revision 6fe77af06f1c4e777095cd5ea48f5387322a3f32) @@ -117,2 +117,6 @@ GET http://localhost:8080/api/places Content-Type: application/json + +### +POST http://localhost:8080/api/add +Content-Type: application/json