WorkクラスのsetInvitesでanimationを新しくセット出来るようにしました。 #105

Merged k-suzuki merged 2 commits into nitta-lab-2021:master from nitta-lab-2021:accountInvited on 25 May 2021

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          14 ■■■■■
          src/main/java/org/ntlab/acanthus_server/entities/Work.java
             package org.ntlab.acanthus_server.entities;
 
import org.ntlab.acanthus_server.models.Gallery;
 
public class Work {
 
    int status = 0;
    Animation animation = null;
    private Gallery animations = Gallery.getInstance();
 
    public Animation getAnimation(){ return this.animation; }
 
    public void setAnimation(Animation anime) { this.animation = anime; }
 
    public void setInvites(){ this.status = 1; }
    public void setInvites(int aid){
        Animation animation = animations.getAnimationByAid(aid);
        this.setAnimation(animation);
        this.status = 1;
    }
 
    public void setWork(){ this.status = 2; }
 
    public boolean isInviting() {
 package org.ntlab.acanthus_server.entities;
+import org.ntlab.acanthus_server.models.Gallery;
 public class Work {
     int status = 0;
+    Animation animation = null;
+    private Gallery animations = Gallery.getInstance();
     public Animation getAnimation(){ return this.animation; }
     public void setAnimation(Animation anime) { this.animation = anime; }
+    public void setInvites(){ this.status = 1; }
+    public void setInvites(int aid){
+        Animation animation = animations.getAnimationByAid(aid);
+        this.setAnimation(animation);
+        this.status = 1;
+    }
     public void setWork(){ this.status = 2; }
     public boolean isInviting() {

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          src/main/java/org/ntlab/acanthus_server/resources/accounts/InvitedRest.java
             }else{
                //招待された作品の招待者の中に自分が含まれているか確認
                if(invitedAnimation.searchAnimationInvites(aid, String.valueOf(invitedUid)) != null){
                    //Workクラスのstateを１に変更
                    accountInvitedMap.get(aid).setInvites();
                    //accountInvitedMap.get(aid).setInvites();
 
                }else{
                    throw new WebApplicationException(400);
             }else{
                 //招待された作品の招待者の中に自分が含まれているか確認
                 if(invitedAnimation.searchAnimationInvites(aid, String.valueOf(invitedUid)) != null){
                     //Workクラスのstateを１に変更
+                    accountInvitedMap.get(aid).setInvites();
+                    //accountInvitedMap.get(aid).setInvites();
                 }else{
                     throw new WebApplicationException(400);